Fix broken tests from deleted imports