test_csv.patch

diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index 06653f5..5a4f28e 100755
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -71,7 +71,9 @@ class TestCSV::DataConverters < TestCSV
     # and use
     assert_equal(["Numbers", ":integer", 1, ":float", "3.015"], @parser.shift)
 
-    setup  # reset
+    # reset
+    teardown
+    setup
 
     # setup parser...
     assert_nothing_raised(Exception) { @parser.convert(:float) }
@@ -91,7 +93,9 @@ class TestCSV::DataConverters < TestCSV
     assert_equal( [String, String, Float, String, Float],
                   @parser.shift.map { |field| field.class } )
 
-    setup  # reset
+    # reset
+    teardown
+    setup
 
     # integers have precendance...
     assert_nothing_raised(Exception) do
@@ -133,7 +137,9 @@ class TestCSV::DataConverters < TestCSV
     # and use
     assert_equal(["Numbers", :integer, "1", :float, "3.015"], @parser.shift)
 
-    setup  # reset
+    # reset
+    teardown
+    setup
 
     # mix built-in and custom...
     assert_nothing_raised(Exception) { @parser.convert(:numeric) }
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 67e5b54..0573228 100755
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -290,6 +290,8 @@ class TestCSV::Table < TestCSV
     ###################
     ### Column Mode ###
     ###################
+    # reset
+    teardown
     setup
     @table.by_col!
 
@@ -307,6 +309,8 @@ class TestCSV::Table < TestCSV
     ################
     ### Row Mode ###
     ################
+    # reset
+    teardown
     setup
     @table.by_row!
 
@@ -343,6 +347,8 @@ class TestCSV::Table < TestCSV
     ###################
     ### Column Mode ###
     ###################
+    # reset
+    teardown
     setup
     @table.by_col!