Fix routing errors and rspec tests