Add scope and fix sorting params
Add rspec