Fix test_dir
Merge pull request #126 from danmcp/master

Fix test_dir
Updated to support Origin builds
Merge pull request #127 from nhr/origin_build_fixes

Updated to support Origin builds