Added class paramater for external templates and tests