fix tests, add some more view stuff