Changed path-separator to run on Mac. Fixed some tests.