Upgrade test suite support
Upgrade to RSpec 3