update the tests comments
Merge remote-tracking branch 'upstream/master'
Nightly commit, starting to attempt to handle different URIs.