Update rspec tests and address a few deprecation warnings.