CFY-1185 remove unused imports
CFY-1185 fix tests