Add template testing and update the test suite