update views
update tests
minor changes