Fix broken tests
Clean up imports