CLOUDIFY-1553 Refactored test to be more explicit for demo purposes
Added machine_unset to work as if it is a datacenter machine and not a cloudmachine