Update of the templates and inclusion of test-files