Maybe I should add this as a separate commit, but this template fetching was breaking the test for me. I didn't investigate it though.