Adding back the removal of the TEST_DIR.  Thanks to sharp eyes.