CLOUDIFY-2370 fix tests and flake