CFY-780 fixed unit tests