CAS-1283: Fixed test failures