clean up views, fix tests