CFY-1373 fixed unit tests