Merge "ChangeManagementController tests"