CAS-1475: fixed test failures