Merge "Change-Management tests: reset presets before each test"