Minor changes
minor changes in the views
Added test cases for the views