Fix test-failures and deprecation warnings on RSpec 3.0