Change new occurrences of URI.parse to Addressable::URI.parse

- Change the test data to not test on underscores, because they're
  valid, but curly braces.
- URI.parse crept in again from a rebase. :-)