Fixed TestHelper finally?