Removes unneeded line of code.
Changes tests to account for changes to views.