CLOUDIFY-1784 Added retry tests