Adjust testcase for Path fixes
Merge branch 'develop'