Fixed rspec test suite
Fixed merge conflicts in _listing and removed controller specs