Added more tests and templates