CLOUDIFY-2599 fix tests