Update controllers, views, tests