CLOUDIFY-2507 fix tests