CFY-1313 fix tests and imports