remove duplicate template and adjust expected results