Added more unit tests for template