RSpec 3 readiness
Removing RSpec 3 deprecation warnings