CFY-1372 fixed tests