Getting rid of some old test code