Clean up of template files and added a test setup section