Add more useful views and tests