extend environment tests

fix some add_machine errors found during testing

start machine deploy tests

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
v1.3