ticket:4. Tests and view updated(See the comments in 'trac')