updates uri extensions + tests

Conflicts:
	src/Umbraco.Core/UriExtensions.cs