Make the template tests pass

Now the CI build should succeed.