Fixed non-match test. Modified State<T> pattern.
Merge branch 'Sprint'