Remerged donut hole template and tweaked some tests