Add more template tests

Copy some template tests from the private SCM