Added more testing to ensure URIs get assembled properly.
(...because last time our tests didn't find Jon's self-inflicted bug.)