Index: ruby/osr/tc_osr_basic.rb
===================================================================
--- ruby/osr/tc_osr_basic.rb	(revision 21959)
+++ ruby/osr/tc_osr_basic.rb	(working copy)
@@ -106,14 +106,14 @@
                     Gdal::Osr::SRS_WGS84_SEMIMAJOR, 
                     Gdal::Osr::SRS_WGS84_INVFLATTENING)
     
-    srs.set_towgs84(1, 2, 3)
+    srs.set_towgs_84(1, 2, 3)
 
-    assert_equal(srs.get_towgs84(), [1,2,3,0,0,0,0])
+    assert_equal(srs.get_towgs_84(), [1,2,3,0,0,0,0])
     proj4 = srs.export_to_proj4()
     
     srs2 = Gdal::Osr::SpatialReference.new()
     srs2.import_from_proj4(proj4)
 
-    assert_equal(srs2.get_towgs84(), [1,2,3,0,0,0,0])
+    assert_equal(srs2.get_towgs_84(), [1,2,3,0,0,0,0])
   end
 end
Index: ruby/ogr/tc_ogr_basic.rb
===================================================================
--- ruby/ogr/tc_ogr_basic.rb	(revision 21959)
+++ ruby/ogr/tc_ogr_basic.rb	(working copy)
@@ -71,7 +71,7 @@
     layer.set_spatial_filter(poly)
     layer.reset_reading()
 
-    assert(1, layer.get_feature_count)
+    assert(1, layer.get_feature_count.to_s)
 
     feat1 = layer.get_next_feature
     feat2 = layer.get_next_feature
Index: ruby/ogr/tc_ogr_wktempty.rb
===================================================================
--- ruby/ogr/tc_ogr_wktempty.rb	(revision 21959)
+++ ruby/ogr/tc_ogr_wktempty.rb	(working copy)
@@ -36,9 +36,7 @@
 	end
 
 	def test_ogr_wktempty_5()
-		geom = Gdal::Ogr.create_geometry_from_wkt("POINT(EMPTY)")
-		wkt = geom.export_to_wkt
-		assert_equal('POINT (0 0)', wkt)
+		assert(check_empty_geom1('POINT'))
 	end
 
 	def test_ogr_wktempty_6()
@@ -66,9 +64,7 @@
 	end
 	
 	def test_ogr_wktempty_12()
-		geom = Gdal::Ogr.create_geometry_from_wkt("POINT EMPTY")
-		wkt = geom.export_to_wkt
-		assert_equal('POINT (0 0)', wkt)
+		assert(check_empty_geom2('POINT'))
 	end
 	
 	def test_ogr_wktempty_13()
Index: ruby/ogr/ogrtest.rb
===================================================================
--- ruby/ogr/ogrtest.rb	(revision 21959)
+++ ruby/ogr/ogrtest.rb	(working copy)
@@ -59,7 +59,7 @@
   poly_feat.each do |orig_feat|
     read_feat = layer.get_next_feature
 
-    assert(check_feature_geometry(read_feat, orig_feat.get_geometry_ref()),
+    assert(check_feature_geometry(read_feat, orig_feat.get_geometry_ref().to_s),
                                   max_error = 0.000000001 )
 
     0.upto(2) do |i|
@@ -195,4 +195,3 @@
     
     #if result != 0:
     #raise ValueError, 'CreateFeature() failed in ogrtest.quick_create_feature()'
-    
\ No newline at end of file
Index: ruby/ogr/tc_ogr_pg.rb
===================================================================
--- ruby/ogr/tc_ogr_pg.rb	(revision 21959)
+++ ruby/ogr/tc_ogr_pg.rb	(working copy)
@@ -197,7 +197,7 @@
 
     feat.set_field( 'SHORTNAME', 'Reset' )
 
-    point = Gdal::Ogr::Geometry.new(Gdal::Ogr::WkbPoint25D)
+    point = Gdal::Ogr::Geometry.new(Gdal::Ogr::WKBPOINT25D)
     point.set_point( 0, 5, 6, 7 )
     feat.set_geometry_directly( point )