refine test cases
Merge branch 'master' into 8.0