Changed test schemas
Added JsonSchema Merger
Updated Schema Generator