Simplify schema spec
Add expectations about keys to schema spec
Build flat array with keys