Fix broken imports that slipped through the tests.