Add Template Tests
Merge Test Suite