CAS-1377: Fixed test failures