CAS-1335: Fixed failing tests