Add missing files and adjust the path for two test cases
Merge pull request #3240 from Randy-Ma/master

Add missing files and adjust the path for two test cases