CLOUDIFY-2544 fix tests