CFY-822 update tests