Index: tol_pkg/GisTools/test/test_0001/test.tol
===================================================================
--- tol_pkg/GisTools/test/test_0001/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/GisTools/test/test_0001/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -76,7 +76,7 @@
 Real eval.p0 = i2dg::eval(p0);
 
-NameBlock i2dg::evaluate(p0);
 
 /*
+NameBlock i2dg::evaluate(p0);
 GisTools::@Point2D.Simple p = p0;
 Set _.x.range = i2dg::_.x.range;
@@ -86,16 +86,13 @@
 VMatrix _.F = i2dg::_.F;
 
-/*
+*/
 
 Real numErr1 = Copy(NError);
 Real numWar1 = Copy(NWarning);
 
-Set partialResults_ = [[numErr0, numErr1, 
-                        ok.1, ok.2]];
+Set partialResults_ = [[numErr0, numErr1]];
 
 //This is a messure of the success of the test 
-Real quality_ = And(numErr1 == numErr0, 
-                    numWar1 == numWar0, 
-                    ok.1, ok.2);
+Real quality_ = And(numErr1 == numErr0);
 
 //Return the results 
Index: tol_pkg/GraphTools/test/test_0001/test.tol
===================================================================
--- tol_pkg/GraphTools/test/test_0001/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/GraphTools/test/test_0001/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -7,4 +7,7 @@
 Text summary_ = "checking a simple graph";
 
+  #Require GraphTools;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
@@ -14,6 +17,4 @@
 Real removeRepeatedEdges = True;
 
-  #Require GraphTools;
-//#Embed "../../../_embed_all.tol";
 
 #Embed "../define.random.graph.tol";
Index: tol_pkg/GraphTools/test/test_0002/test.tol
===================================================================
--- tol_pkg/GraphTools/test/test_0002/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/GraphTools/test/test_0002/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -6,4 +6,7 @@
 Text link_ = ""; 
 Text summary_ = "checking a simple graph";
+
+  #Require GraphTools;
+//#Embed "../../../_embed_all.tol";
 
 //Write here the initial test TOL code if needed
@@ -15,7 +18,4 @@
 Real edge.num = 20000;
 Real removeRepeatedEdges = True;
-
-  #Require GraphTools;
-//#Embed "../../../_embed_all.tol";
 
 #Embed "../define.random.graph.tol";
Index: tol_pkg/MatQuery/test/test_0001/test.tol
===================================================================
--- tol_pkg/MatQuery/test/test_0001/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/MatQuery/test/test_0001/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -9,4 +9,7 @@
 Text summary_ = "checking matrix row selection";
 
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
@@ -18,6 +21,4 @@
 WriteLn("Current Random Seed = "<<rndSeed);
 
-  #Require MatQuery;
-//#Embed "../../../_embed_all.tol";
 
 //The order of magnitude required for number of geographic points
@@ -69,4 +70,5 @@
 VMatrix points = Mat2VMat(BinGroup("<<",city.points));
 
+
 //Target point
 VMatrix p0 = SubRow(points,[[IntRand(1,point.num)]])+
@@ -79,4 +81,5 @@
   points, p0, distance);
 VMatrix p0.select.HC = SubRow(points,p0.select.idx.HC);
+
 Real t1 = Copy(Time);
 WriteLn("SelectRowsInHyperCube full "<<VRows(p0.select.HC)+" items "
@@ -88,4 +91,5 @@
   points, p0, distance);
 VMatrix p0.select.HE.1 = SubRow(points,p0.select.idx.HE.1);
+
 Real t2 = Copy(Time);
 WriteLn("SelectRowsInHyperSphere full "<<VRows(p0.select.HE.1)+" items "
@@ -106,4 +110,5 @@
   Card(p0.select.idx.HE.1   *      p0.select.idx.HC) == 
   Card(p0.select.idx.HE.1));
+
 Real ok.2 = VMatMax(Abs(p0.select.HE.2-p0.select.HE.1))==0;
 
Index: tol_pkg/MatQuery/test/test_0002/test.tol
===================================================================
--- tol_pkg/MatQuery/test/test_0002/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/MatQuery/test/test_0002/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -9,10 +9,10 @@
 Text summary_ = "checking matrix row selection";
 
+  #Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
 Real numWar0 = Copy(NWarning);
-
-  #Require MatQuery;
-//#Embed "../../../_embed_all.tol";
 
 Real t1 = Copy(Time);
Index: tol_pkg/MatQuery/test/test_0003/test.tol
===================================================================
--- tol_pkg/MatQuery/test/test_0003/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/MatQuery/test/test_0003/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -9,27 +9,37 @@
 Text summary_ = "checking matrix row selection of unknown values";
 
+//#Require MatQuery;
+//#Embed "../../../_embed_all.tol";
+
 //Write here the initial test TOL code if needed
 Real numErr0 = Copy(NError);
 Real numWar0 = Copy(NWarning);
 
-#Require MatQuery;
-//#Embed "../../../_embed_all.tol";
-
 Real t1 = Copy(Time);
 Real rndSeed = 0;
 Real m = 300;
+Real n = 10;
 
-VMatrix unk.match = LE(Rand(m,1,0,1),Rand(m,1,1,1)*.20);
-VMatrix M = IfVMat(unk.match, Rand(m,1,1,1)*?, Rand(m,1,-10,10));
+VMatrix unk.match = LE(Rand(m,n,0,1),Rand(m,n,1,1)*.20);
+VMatrix M = IfVMat(unk.match, Rand(m,n,1,1)*?, Rand(m,n,-10,10));
 
-VMatrix unk.match_ = MatQuery::MatchRowsWithValue(M,?);
-Real ok.1 = VMatMax(Abs(unk.match-unk.match))==0;
+VMatrix M.unk = Min(IsUnknown(M)*Rand(n,1,1,1), Rand(m,1,1,1));
 
-Set sel.known = MatQuery::SelectMatch(Not(unk.match_));
+VMatrix M.rows.known = Pack(Not(IsUnknown(M)*Rand(n,1,1,1)));
+VMatrix M.rows.unknown = Pack(Not(M.rows.known));
+VMatrix M.rows.known_= MatQuery::MatchRowsFullKnown(M);
 
-VMatrix extract.known = SubRow(M, sel.known);
+VMatrix unk.match.1 = LE(Rand(m,1,0,1),Rand(m,1,1,1)*.20);
+VMatrix M1 = IfVMat(unk.match.1, Rand(m,1,1,1)*?, Rand(m,1,-10,10));
+
+VMatrix unk.match.1_ = MatQuery::MatchRowsWithValue(M1,?);
+Real ok.1 = VMatMax(Abs(unk.match.1-unk.match.1))==0;
+
+Set sel.known = MatQuery::SelectMatch(Not(unk.match.1_));
+
+VMatrix extract.known = SubRow(M1, sel.known);
 
 Real ok.2 = VMatSum(IsUnknown(extract.known))==0;
-Real ok.3 = VRows(extract.known)==m-VMatSum(unk.match);
+Real ok.3 = VRows(extract.known)==m-VMatSum(unk.match.1);
 
 
Index: tol_pkg/MulVarFunAprox/test/test_0001/test.tol
===================================================================
--- tol_pkg/MulVarFunAprox/test/test_0001/test.tol	(revision 345a4d7c8a9665587d9a44b0d4b9542be156cfb9)
+++ tol_pkg/MulVarFunAprox/test/test_0001/test.tol	(revision aa1e2ccf70aae87a9e1638e0285e4b7c75469c7f)
@@ -18,6 +18,6 @@
 WriteLn("Current Random Seed = "<<rndSeed);
 
-//#Require MulVarFunAprox;
-#Embed "../../../_embed_all.tol";
+#Require MulVarFunAprox;
+//#Embed "../../../_embed_all.tol";
 
 Real n = 2;
@@ -94,5 +94,5 @@
 /* */
 
-Real J = K*10000;
+Real J = K*100;
 
 VMatrix X = Group("ConcatColumns",For(1,n,VMatrix(Real i)