Small cleanups for TestMongoStore