Index: vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst
===================================================================
diff -u -r029f81202ba37760d0b3c9360d81ddb19394698b -r529fbb19594f5b3408287e6e43583a3b89654897
--- vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst	(.../NVDATAMGMT.tst)	(revision 029f81202ba37760d0b3c9360d81ddb19394698b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst	(.../NVDATAMGMT.tst)	(revision 529fbb19594f5b3408287e6e43583a3b89654897)
@@ -87,7 +87,6 @@
 TEST.NEW
 TEST.NAME:enqueue_Modulus_Not_Zero
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
-TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].startAddress:<<malloc 1>>
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[0]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[1]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[2]:0
@@ -105,7 +104,6 @@
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[14]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[15]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[0].externalAddress:<<malloc 1>>
-TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[1].startAddress:<<malloc 1>>
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[0]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[1]:0
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[2]:0
@@ -130,34 +128,34 @@
 TEST.VALUE:NVDataMgmt.enqueue.location:NVDATAMGMT_EEPROM
 TEST.VALUE:NVDataMgmt.enqueue.startAddress:2
 TEST.VALUE:NVDataMgmt.enqueue.data:<<malloc 24>>
-TEST.VALUE:NVDataMgmt.enqueue.data[0]:1
-TEST.VALUE:NVDataMgmt.enqueue.data[1]:2
-TEST.VALUE:NVDataMgmt.enqueue.data[2]:3
-TEST.VALUE:NVDataMgmt.enqueue.data[3]:4
-TEST.VALUE:NVDataMgmt.enqueue.data[4]:5
-TEST.VALUE:NVDataMgmt.enqueue.data[5]:6
-TEST.VALUE:NVDataMgmt.enqueue.data[6]:7
-TEST.VALUE:NVDataMgmt.enqueue.data[7]:8
-TEST.VALUE:NVDataMgmt.enqueue.data[8]:9
-TEST.VALUE:NVDataMgmt.enqueue.data[9]:0
-TEST.VALUE:NVDataMgmt.enqueue.data[10]:1
-TEST.VALUE:NVDataMgmt.enqueue.data[11]:2
-TEST.VALUE:NVDataMgmt.enqueue.data[12]:3
-TEST.VALUE:NVDataMgmt.enqueue.data[13]:4
-TEST.VALUE:NVDataMgmt.enqueue.data[14]:5
-TEST.VALUE:NVDataMgmt.enqueue.data[15]:6
-TEST.VALUE:NVDataMgmt.enqueue.data[16]:7
-TEST.VALUE:NVDataMgmt.enqueue.data[17]:8
-TEST.VALUE:NVDataMgmt.enqueue.data[18]:9
-TEST.VALUE:NVDataMgmt.enqueue.data[19]:0
-TEST.VALUE:NVDataMgmt.enqueue.data[20]:1
-TEST.VALUE:NVDataMgmt.enqueue.data[21]:2
-TEST.VALUE:NVDataMgmt.enqueue.data[22]:3
-TEST.VALUE:NVDataMgmt.enqueue.data[23]:4
+TEST.VALUE:NVDataMgmt.enqueue.data[0]:0x61
+TEST.VALUE:NVDataMgmt.enqueue.data[1]:0x62
+TEST.VALUE:NVDataMgmt.enqueue.data[2]:0x63
+TEST.VALUE:NVDataMgmt.enqueue.data[3]:0x64
+TEST.VALUE:NVDataMgmt.enqueue.data[4]:0x65
+TEST.VALUE:NVDataMgmt.enqueue.data[5]:0x66
+TEST.VALUE:NVDataMgmt.enqueue.data[6]:0x67
+TEST.VALUE:NVDataMgmt.enqueue.data[7]:0x68
+TEST.VALUE:NVDataMgmt.enqueue.data[8]:0x69
+TEST.VALUE:NVDataMgmt.enqueue.data[9]:0x70
+TEST.VALUE:NVDataMgmt.enqueue.data[10]:0x71
+TEST.VALUE:NVDataMgmt.enqueue.data[11]:0x72
+TEST.VALUE:NVDataMgmt.enqueue.data[12]:0x73
+TEST.VALUE:NVDataMgmt.enqueue.data[13]:0x74
+TEST.VALUE:NVDataMgmt.enqueue.data[14]:0x75
+TEST.VALUE:NVDataMgmt.enqueue.data[15]:0x76
+TEST.VALUE:NVDataMgmt.enqueue.data[16]:0x77
+TEST.VALUE:NVDataMgmt.enqueue.data[17]:0x78
+TEST.VALUE:NVDataMgmt.enqueue.data[18]:0x79
+TEST.VALUE:NVDataMgmt.enqueue.data[19]:0x80
+TEST.VALUE:NVDataMgmt.enqueue.data[20]:0x81
+TEST.VALUE:NVDataMgmt.enqueue.data[21]:0x82
+TEST.VALUE:NVDataMgmt.enqueue.data[22]:0x83
+TEST.VALUE:NVDataMgmt.enqueue.data[23]:0x84
 TEST.VALUE:NVDataMgmt.enqueue.length:24
+TEST.VALUE:uut_prototype_stubs.crc16.return:0x1234
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].memoryOperation:NVDATAMGMT_WRITE
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].memoryLocation:NVDATAMGMT_EEPROM
-TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].startAddress[0]:2
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[0]:0x61
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[1]:0x62
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].buffer[2]:0x63
@@ -177,7 +175,6 @@
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[0].length:16
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].memoryOperation:NVDATAMGMT_WRITE
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].memoryLocation:NVDATAMGMT_EEPROM
-TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].startAddress[0]:18
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[0]:0x77
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[1]:0x78
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.jobQueue[1].buffer[2]:0x79