Remove TestHelper, move remaining bits to JUnitHelper.