fix some imports in the current test suite