Additional test coverage cleanup

Also fixes the template._child implementation which broke with the depthed work.