updated views and tests
merge fixes