Update test cases with new changes
Ommit some files when commit
Merge remote-tracking branch 'origin/master'