Updated some names, removed some stub tests, cleared out StateMachine.