ticket:3 updated tests, fixed link in templates
Merge branch 't3' into t4
ticket:5 merge t4