ticket:3 correct edit view and test
ticket:3 correct tests