Updated views and wrote failing tests