Adding tests and fixing path concatenation
Merge pull request #1 from leadhead9/utility-fixes

Adding tests and fixing path concatenation