Move SchemaStruct and SchemaArray to util
Add more decoration tests