Bug Fixes and test additions (OpenAPI support only)

Fixed a few bugs, including Included support for documents. Added some tests around that and more.