SERVER-7452 tests and SERVER-7907 fix typo and tests