Added helper function for generic method of referencing machines in tests
Added basic test structure, cleanup of driver code