fix test import issues