Updates tests and renames some view.s