Cleaning up some TDS tests stuff