Tidy up some dead testing code