CXX-440 Fix tests for 2.2