CXX-237 more tests