updated schemas, tests to cover most all examples

The example 04-models-with-composition.json is not supported in the schema, nor is it tested.  Other than that, these schemas should serve as a good draft.