CFY-1272 fixed tests