updated views and tests