Fix machine id tests, use any allocated and ready node, remove some unused and confusing code.

Signed-off-by: Michael McCracken <mike.mccracken@canonical.com>
Merge pull request #9 from mikemccracken/fix_machine_ids

Fix machine id issues