Add test and modify views.