Fix unit tests, do less os.sep.joins.