CLOUDIFY-2454 added unit tests