Updated some of the code in the URI normalization, including some tests that were invalid.