added generic views and test cases