Merge pull request #126 from danmcp/master

Fix test_dir