Tidying up tests and templates.