Fix broken unittest and remove unused import