remove extra views, fix tests