Streamline Rspec tests, simplify routes