Removed unused tests.
Updated the views