Altered the tests to work with the templates