ticket:3 fixed tests and views