Index: wflow-py/UnitTests/TestBMI.py
===================================================================
diff -u -r6a14ff8e3e70664c2fa02fcb0c5545d8753737f5 -r9d6d3f02533e3452466d6115f29c905c9eb646f2
--- wflow-py/UnitTests/TestBMI.py	(.../TestBMI.py)	(revision 6a14ff8e3e70664c2fa02fcb0c5545d8753737f5)
+++ wflow-py/UnitTests/TestBMI.py	(.../TestBMI.py)	(revision 9d6d3f02533e3452466d6115f29c905c9eb646f2)
@@ -9,6 +9,7 @@
 Simple test for wflow bmi framework
 """
 
+
 class MyTest(unittest.TestCase):
 
     def testbmifuncs(self):
@@ -19,9 +20,11 @@
         print("-------------- Grid origin: ")
         gorigin = bmiobj.get_grid_origin('Altitude')
         print(gorigin)
+        self.assertAlmostEquals(sum([52.054268, 5.2271633]), sum(gorigin),places=4)
 
         print("-------------- Grid shape: ")
         print(bmiobj.get_grid_shape('Altitude'))
+        self.assertAlmostEquals(sum([169L, 187L]), sum(bmiobj.get_grid_shape('Altitude')),places=4)
 
         print("-------------- Grid spacing: ")
         print(bmiobj.get_grid_spacing('Altitude'))
@@ -61,8 +64,8 @@
 
         print("-------------- Current time: ")
         print(bmiobj.get_current_time())
-        a= bmiobj.get_current_time()
-        #print(time.localtime(bmiobj.get_current_time()))
+        a = bmiobj.get_current_time()
+        # print(time.localtime(bmiobj.get_current_time()))
 
         os.environ['TZ'] = 'Europe/London'
 
@@ -87,8 +90,6 @@
         print(bmiobj.get_end_time())
         print(time.localtime(bmiobj.get_end_time()))
 
-
-
         print("-------------- Grid type: ")
         print(bmiobj.get_grid_type('Altitude'))
 
@@ -113,6 +114,15 @@
         print("-------------- get_attribute_names: ")
         names = bmiobj.get_attribute_names()
         print names
+        self.assertEquals(['API:IF', 'API:InwaterMM', 'framework:outputformat', 'framework:debug', 'framework:netcdfinput',
+                           'framework:netcdfoutput', 'framework:netcdfstaticoutput', 'framework:netcdfstaticinput',
+                           'framework:EPSG', 'framework:netcdf_format', 'framework:netcdf_zlib',
+                           'framework:netcdf_least_significant_digit', 'run:starttime', 'run:endtime',
+                           'run:timestepsecs', 'run:reinit', 'modelparameters:AltTemperature', 'layout:sizeinmetres',
+                           'outputmaps:self.TSoil', 'outputmaps:self.AltTemperature', 'outputcsv_0:samplemap',
+                           'outputcsv_0:self.TSoil', 'outputcsv_0:self.AltTemperature', 'outputcsv_1:samplemap',
+                           'outputtss_0:samplemap', 'model:timestepsecs']
+, names)
 
         print("-------------- get_attribute_value: ")
         print names[0]
@@ -122,6 +132,7 @@
         print names[0]
         bmiobj.set_attribute_value(names[0],"SET By TEST")
         print(bmiobj.get_attribute_value(names[0]))
+        self.assertEquals("SET By TEST",bmiobj.get_attribute_value(names[0]))
 
         print("-------------- set_start_time: ")
         bmiobj.set_start_time(0)
@@ -143,6 +154,5 @@
         bmiobj.finalize()
 
 
-
 if __name__ == '__main__':
     unittest.main()