Remove wildcard import from test_merge and fixup