Renamed views, updated tests