Expand templates

From Steve Lamb Tests

Expand templates