Wrapped up the Path test driver; began cleanup and comments