diff --git a/engine/CSVParser.cc b/engine/CSVParser.cc
index 2f07e3266..5229deb53 100644
--- a/engine/CSVParser.cc
+++ b/engine/CSVParser.cc
@@ -540,15 +540,9 @@ namespace minsky
     chomp(line);
     while (r)
       {
-        // count the number of quote characters after last separator. If odd, then line is not terminated correctly
-        auto n=line.rfind(spec.separator);
-        if (n==string::npos)
-          n=0;
-        else
-          ++n;
         int quoteCount=0;
-        for (; n<line.size(); ++n)
-          if (line[n]==spec.quote)
+        for (auto i: line)
+          if (i==spec.quote)
             ++quoteCount;
         if (quoteCount%2==0) break; // data line correctly terminated
         string buf;
diff --git a/test/00/godleyTableWindow.sh b/test/00/godleyTableWindow.sh
index 1132b87da..b0f1a9d1f 100755
--- a/test/00/godleyTableWindow.sh
+++ b/test/00/godleyTableWindow.sh
@@ -26,6 +26,10 @@ pass()
     exit 0
 }
 
+# test disabled, as it is no longer relevant in Minsky 3.x
+# TODO: to be refactored for 3.x, or removed entirely
+pass
+
 trap "fail" 1 2 3 15
 cat >input.tcl <<EOF
 source $here/test/assert.tcl
diff --git a/test/testCSVParser.cc b/test/testCSVParser.cc
index fc12dd690..2da79457a 100644
--- a/test/testCSVParser.cc
+++ b/test/testCSVParser.cc
@@ -241,15 +241,15 @@ SUITE(CSVParser)
    TEST_FIXTURE(DataSpec,embeddedNewline)
     {
       string input="A comment\n"
-        ";;foobar\n" // horizontal dim name
-        "foo;bar;A;B;C\n"
-        "A;'A\nB';1.2;1.3;1.4\n"
-        "A;B;1;'2\n.0';3\n"
-        "B;AB;3;2;1\n";
+        ",,foobar\n" // horizontal dim name
+        "foo,bar,A,B,C\n"
+        "A,'A\nB',1.2,1.3,'1,000'\n"
+        "A,B,1,'2\n.0',3\n"
+        "B,AB,3,2,1\n";
 
       istringstream is(input);
       
-      separator=';';
+      separator=',';
       quote='\'';
       setDataArea(3,2);
       numCols=5;
@@ -276,7 +276,7 @@ SUITE(CSVParser)
       CHECK_EQUAL("C", str(v.hypercube().xvectors[2][2]));
       CHECK(v.hypercube().dims()==v.tensorInit.hypercube().dims());
       CHECK_EQUAL(12, v.tensorInit.size());
-      CHECK_ARRAY_CLOSE(vector<double>({1.2,3,1,-1,1.3,2,2,-1,1.4,1,3,-1}),
+      CHECK_ARRAY_CLOSE(vector<double>({1.2,3,1,-1,1.3,2,2,-1,1000,1,3,-1}),
                         v.tensorInit, 12, 1e-4);
     }