CAS-1271: Fixed test failures across all modules.