SERVER-7174 Cleanup and strengthen some new modifier tests