CFY-660 fixed unit tests