Removed extra fields in schema Fixed test cases Fixing CI
Signed-off-by: leonwanghui <leon.wanghui@huawei.com>