Merge "Extend Uri tests"