One of the edge cases that was missing was that of a service not being present in uuid 2's metadata, added a simple test case to ensure it's present in both datasets before continuing. Change-Id: Ic2c49fb6dc348acf5dff8291008200a24001340f