CFY-1371 fixed unit tests