Refactoring tests to use click_link and more helpers