added generic views + tests