Only comment tags out instead of removing them. Add coverage again