ticket:1 updated tests and templates