Eliminate unused imports in the test suite