CLOUDIFY-2486 fix tests