Remove raw Matcher in class TestHelper