Merge "Add modelschema test"