Fix tests broken by recent changes
Update mocha dependency to 1.1.0
Update rspec-rails dependency to 3.0.4