Changed to generic views
Added test