merge test files from branch jz
Merge branch 'master' into jz