Fix fallout of removing import_shadowing in tests.