Extract test bugfix from Hafiz's PR
Merge pull request #9 from ColinScott/TestPathFix

Extract test bugfix from Hafiz's PR