CFY-1574 fix unit tests