Adapt partials to use newly defined routes
Refactor Rspec tests