Omit adding templates to the collection during prepareElement()...it just causes problems
Fix handling of template element names
(previous test silently passed with no assertions, masking the failure)
Closes #8