Fix and enable -Path scenario test
Apply code review
Apply CR
Merge pull request #1202 from ogail/test

Fix and enable -Path scenario test