Fix unit tests to concat paths better.
Merge pull request #18 from deverton/test-fixes

Fix unit tests to concat paths better.