test-mongomerge cleanup - fixtures, c89, style