Fixed bug in DirectoryHandler.  All tests now passing on OSX.