Fix output behavior; All machine tests are now passing