Fixed failing builds due to removals in previous commit.
Merge branch 'master' of github.com:glynos/uri
Removed tests that are actually expected to fail.