Fixed generating multiple ULRs from multiple DS descriptions, and updated fixtures for testdata.