Update test suite to support rspec 3.