update rspec for links and simplification