Changed Main/test to use Machine.