Update test suite for rspec 3