Clean up imports in tests to remove warnings