fix(test_ami): Fix assorted mistakes from last review cycle.

This at least gets autotest running and logging into the hosts but none
of the tests are actually executed properly yet. One step at a time..
Merge pull request #101 from marineam/master

fix(test_ami): Fix assorted mistakes from last review cycle.