CFY-661 fixed tests