fix tests, remove unused imports.