Merge "Reenable the unit tests for StateMachine"