Cleanup some old test code.