Clean up rspec tests, add some more links