Changed test
Added a state machine matcher
Added state based matchers
Fast port to state machine matchers
Fixed
COnverted lookup to while