:scissors: [ci skip]
Fix typo in test descriptions
Bundle update for both Rails 3.1 and 3.2, update mocha, fix failing tests