CFY-494 update tests