Tidy up and simplified TestHelper