Last bit of changes to BuildDestinationUri and its unit tests

for now...