Fixed unit test for import refactoring