Updating to RSpec 3
Fixing remaining deprecations in RSpec syntax