CLOUDIFY-1944 fix tests