Added tests cleaned up the view