CXX-324 fix additional tests