First stab at fixing some RSpec 2 -> 3 deprecations

They were bothering me while testing.