Fixing up the template and removing the broken tests