refactor Add more template tests

Close #485
refactor Add even more template tests