Get rid of some old test stuff