Remove old imports from tests