Added additional templates for testing