Remove unused import, add last tests... Marcin should be happy.