Fix tinderbox bustage caused by the template location code change.  The tests are now looking in the right place for the
templates.  4 templates in the new location now come up with syntax errors however.