Add back colors to rspec
Fix sorting on the controller level