SERVER-7174: pop log and test refactoring