Update specs to run cleanly without deprecation warnings under RSpec 3.0.x