started work on abstracting out template tests