added some test ckass
Merge remote-tracking branch 'github/master'