Fixed errors and numbering inconsistencies in test script.
Added normalize-subtree kludge to 'fix' excessive nesting issue.
Updated template vocabulary documentation.