Test Refactor, MachineTests splitted