more cleanup getting the NWT_Tester tracked properly