CLOUDIFY-1595 fix tests