Work on the test templates