some test fixes for state machine