CLOUDIFY-2433 fixed tests