With Veronica's hlep, fix problems with path, complete the unit tests.