Changes to documents.js to use expanded data model

Did you mean to leave all these tests commented out?