CLOUDIFY-2029 some more coverage