Modify and add new testcases.

Change-Id: Ice3a0cdf7eb92e95b3a3a455a9be83bdb93c88c0

some changes

Change-Id: I8a75c75e59f5fa0dad95ba58adee0d3e9d1ee172
2 files changed