Restore test to actually test template rendering, add some others