update views and add integration testing for them