updated tests and templates