CXX-318 Re-enable tests previously disabled