Updated Results structure to align better with Dataset definition.

@@ -157,13 +157,9 @@
     * ResultSet Structure Definition. 
     * ResultSet Structure Definition. 
     *************************************
     *************************************
     -->
     -->
-    <struct name="ResultSet" type="GeoSpatial.Object" rttkey="GeoSpatial.ObjectType.IlpTestResultSet">
+    <struct name="ServiceResults" type="GeoSpatial.Object" rttkey="GeoSpatial.ObjectType.IlpTestResultSet">
       <comment>Specification for an ILP analysis test data result set.</comment>
       <comment>Specification for an ILP analysis test data result set.</comment>
 
 
-      <elem name="uuidData" multiplicity ="0..*" type="UUID" >
-        <comment>Zero or more UUIDs identifying the survey test data used in this result set.</comment>
-      </elem>      
-      
       <elem name="records" type="ResultRecord" multiplicity="0..*">
       <elem name="records" type="ResultRecord" multiplicity="0..*">
         <comment>The estimated position result records.</comment>
         <comment>The estimated position result records.</comment>
       </elem>
       </elem>
@@ -190,13 +186,9 @@
     * Results Structure Definition. 
     * Results Structure Definition. 
     *************************************
     *************************************
     -->
     -->
-    <struct name="Results" type="GeoSpatial.Object" rttkey="GeoSpatial.ObjectType.IlpTestResults">
+    <struct name="DataSetResults" type="GeoSpatial.Object" rttkey="GeoSpatial.ObjectType.IlpTestResults">
       <comment>Specification for an ILP analysis test data result set.</comment>
       <comment>Specification for an ILP analysis test data result set.</comment>
 
 
-      <elem name="uuidData" multiplicity ="0..*" type="UUID" >
-        <comment>Zero or more UUIDs identifying the survey test data used in this result set.</comment>
-      </elem>
-
       <elem name="startExecutionDate" type="datetime" multiplicity="1">
       <elem name="startExecutionDate" type="datetime" multiplicity="1">
         <comment>Date and time the test was executed.</comment>
         <comment>Date and time the test was executed.</comment>
       </elem>      
       </elem>      
@@ -206,9 +198,13 @@
         <comment>Duration of the execution time in milliseconds.</comment>
         <comment>Duration of the execution time in milliseconds.</comment>
       </elem>
       </elem>
 
 
-      <elem name="resultsets" multiplicity="0..*" type="ResultSet">
+      <elem name="serviceResults" multiplicity="0..*" type="ServiceResults">
         <comment>Results processed by a specified service.</comment>
         <comment>Results processed by a specified service.</comment>
       </elem>
       </elem>
+
+      <elem name="uuidData" multiplicity ="0..*" type="UUID" >
+        <comment>Zero or more UUIDs identifying the survey test data used in this result set.</comment>
+      </elem>
     </struct>
     </struct>
 
 
     <!-- 
     <!-- 
@@ -260,7 +256,7 @@
           
           
           <comment>Test Execution output. Note if not wanting results, the execute method will return early with a processing result code.</comment>
           <comment>Test Execution output. Note if not wanting results, the execute method will return early with a processing result code.</comment>
 
 
-          <elem name="results" multiplicity="0..1" type="Results">
+          <elem name="results" multiplicity="0..*" type="Results">
             <comment>The result test data set if the 'returnResults' option was selected on input.</comment>
             <comment>The result test data set if the 'returnResults' option was selected on input.</comment>
           </elem>
           </elem>