fixup imports in tests