ticket:3 updated tests, fixed link in templates