Added a test for template classes, getting ready to sort the templates out