Merge "Improve and extend Uri granting tests."