ticket:5 edit test, view, template
merge conflicts