Fix git merge error on testcase import path
Merge pull request #1204 from junmendoza/DSDynamoJun

Fix git merge error on testcase import path