cleaning up a few views and tests