Debugged MachineRunner + added test cases