Cleaned up ordered state machine test