standby test and fix some bugs

need rebase. i change someMachineMessage -> machineMessage