CLOUDIFY-2553 added several end cases