Upgrade rspec to 2.14 and update to expect over should syntax