CFY-606 fix tests and flake