Add routes and condense rspec tests