Added tests that use template data - ref #2