CFY-973 fixed tests