CLOUDIFY-2423 fixed tests