CFY-781 fixed tests