Minor fix + Testcases + Template