CAS-1354: Fixed further test failures