CFY-1313 wait for service to start
CFY-1313 fix flake