CLOUDIFY-1818 Updated tests so return codes match CLOUDIFY-1818