CLOUDIFY-2222 fixed tests