Remove unused imports and fix a hidden unit test.