Tidy up Rspec features and dry out link helper