CFY-1746 refactor tests
CFY-1746 fix flake