Index: tst_TreatmentHeparineData/test.py
===================================================================
diff -u -r2b0ff4367443cf0458594c81c32598df5b6c39cb -r0a4b4e4653203852eae6d9edb24116f2147a7c3e
--- tst_TreatmentHeparineData/test.py	(.../test.py)	(revision 2b0ff4367443cf0458594c81c32598df5b6c39cb)
+++ tst_TreatmentHeparineData/test.py	(.../test.py)	(revision 0a4b4e4653203852eae6d9edb24116f2147a7c3e)
@@ -16,6 +16,7 @@
 import names
 from dialin.squish import utils, denaliMessages
 
+
 def getUnit():
     global saline_unit 
     saline_unit = str(waitForObjectExists(names.o_treatmentStart_HeparinSection).unit)
@@ -27,11 +28,18 @@
     test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinSection).title     ), "HEPARIN")
     test.compare(    waitForObjectExists(names.o_treatmentStart_HeparinSection).visible    , True)
 
+
 def test_values(vDelivered):
-    delivered = "{:.1f}".format(vDelivered)
-    test.compare(    waitForObjectExists(names.o_treatmentStart_HeparinSection).valueDelivered, float(delivered) )
-    test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinDelivered ).text),  delivered)
+    fDelivered = "{:.1f}".format(vDelivered)
+    iDelivered = "{}".format(int(vDelivered))
+    value = waitForObjectExists(names.o_treatmentStart_HeparinSection).valueDelivered
+    if value.is_integer():
+        print(iDelivered)
+        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinDelivered ).text),  iDelivered)
+    else:
+        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinDelivered ).text),  fDelivered)
 
+
 def main():
     utils.tstStart(__file__)
 
@@ -43,19 +51,18 @@
    
     getUnit()
 
-    for value in range(0, 21):
+    for value in range(0, 101):
         denaliMessages.setTreatmentHeparinData(value * 0.1)
         test_values                           (value * 0.1)
 
-     
-    denaliMessages.setTreatmentHeparinData(2.0)
-    test_values                           (   )
+    denaliMessages.setTreatmentHeparinData(10.0)
+    test_values                           (10.0)
 
-    denaliMessages.setTreatmentHeparinData(2.0)
-    test_values                           (   )
+    denaliMessages.setTreatmentHeparinData(10.0)
+    test_values                           (10.0)
 
-    denaliMessages.setTreatmentHeparinData(  0)
-    test_values                           (   )
+    denaliMessages.setTreatmentHeparinData(   0)
+    test_values                           (   0)
 
 
     utils.tstDone()