CLOUDIFY-2475 fix tests