Converted test to JUnit4
Added a state machine matcher
Added state based matchers
Fast port to state machine matchers
Fixed