Rspec3 deprecations

There were a bunch of deprecation warnings and test failures related to RSpec 3.  I fixed them.