Index: wflow-py/UnitTests/TestBMI_combined.py
===================================================================
diff -u -r6506c343c0e081144b316c548882a31cec975d93 -re2336bc0557f4dec254c617f3bb9cd811721a2d8
--- wflow-py/UnitTests/TestBMI_combined.py	(.../TestBMI_combined.py)	(revision 6506c343c0e081144b316c548882a31cec975d93)
+++ wflow-py/UnitTests/TestBMI_combined.py	(.../TestBMI_combined.py)	(revision e2336bc0557f4dec254c617f3bb9cd811721a2d8)
@@ -18,25 +18,31 @@
     def testbmifuncs(self):
 
         bmiobj = bmi.wflowbmi_csdms()
-        bmiobj.initialize('bmirunner.ini')
+        bmiobj.initialize('bmirunner.ini',loglevel=logging.INFO)
 
         print bmiobj.get_component_name().split(',')
         print bmiobj.get_input_var_names()
         print bmiobj.get_output_var_names()
         print bmiobj.get_start_time()
-        print bmiobj.get_end_time()
-        print bmiobj.get_current_time()
+        endtime = bmiobj.get_end_time()
+        curtime = bmiobj.get_current_time()
+        print endtime
+        print curtime
         print bmiobj.get_time_step()
         print bmiobj.get_attribute_names()
-        steps =  (bmiobj.get_end_time() -  bmiobj.get_start_time())/bmiobj.get_time_step() + 1
+        steps =  0
         print steps
-        for a in range(0,steps):
+        while curtime < endtime:
             bmiobj.update()
+            steps = steps + 1
+            curtime = bmiobj.get_current_time()
 
         atn = bmiobj.get_attribute_names()
         print atn[0]
         print bmiobj.get_attribute_value(atn[0])
         bmiobj.finalize()
+        self.assertEquals(steps, 29)
+        self.assertEquals(curtime, bmiobj.get_current_time())
 
 
 if __name__ == '__main__':