CAS-1377: Fixed validator test failures