Made path combining work for both Mac and Win. All tests now passing.