Make tests pass in rspec 3. Ignoring deprecation warnings for now.