Fixes for issues #6 and #7

Lots of live tests added.

Use of Util::dirname() in place of dirname(). This has been strangely working for a good many years, then failing on a new environment. I suspect it was just the the right combination of directories with files or no files in that triggered the erroneous behavior.