silly fix in unit test
Split a unit test that. Small cleanups elsewhere.
Merge pull request #8 from hpence/develop

Last bit of changes to BuildDestinationUri and its unit tests