Add in some root class testing
Add some more testing at the leaf and fix syntax in the template