Clean up imports in test