Get rid of unused test helper stuff