CFY-287 fixed tests