Begin tweaking the default public templates to make them testable.