Adam/resolve merge conflicts

@adampalay The mongo counts could vary +- as the code varies.  So we just need to update the test code with the new numbers.