Vishal #0 minor
Vishal #0 Added tests
Vishal #0 seperated views
Vishal #0 minor fixes