merge test files from branch jz