Moved from test + changed Document structure.