CLOUDIFY-2474 more tests