Refactor to remove duplication and logic

Condensed two views into one rendered as a collection
Condensed view logic for possible extraction to a helper
Clean up tests

Best to do setup before you interact with the site.
Also good to be specific about where you are looking for things.