Improved unit tests that fail in ReSharper due to incorrect URI escaping.