Fixing tests that may have resulted from paths being reset