Fix TestHelper