Updates to the document and document type scaffold and tests