Improve error definitions
Upgrade rspec to 2.99 to prepare for 3.0
Upgrade rspec to 3.0