Pass tests for templates branch