Updates for -T testing, cleanup, still working on the 2 failing tests that appear to result as a side effect of temp directories involving /testdir/TESTDIR on linux or /testdir/testdir on windows (the second subfolder /TESTDIR or /testdir is a result of one of the /examples scripts extracting to the wrong directory).