Updated import paths for tests.