clean up views and tests