Upgrade RSpec3 and eliminate deprecation warnings