CLOUDIFY-1559 fix tests