CFY-443 fixed tests