Fixed some unit-tests for the new State Machine.