Fix tests that relied on bare templates