Added tests for json schema generation
Refactored excessive arguments into option classes, added finer grained control over embedding