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

Signed-off-by: Ian Whalen <ian.whalen@gmail.com>