clean imports and fix test