Update some test cases
Merge remote-tracking branch 'RaymondChao/B70-ZK-2004'