Incorporate new tests and add a test stencil template.