CAS-1451: fixed test failures