--- a/trunk/Toss/Solver/SolverTest.ml
+++ b/trunk/Toss/Solver/SolverTest.ml
@@ -4,10 +4,8 @@
 let formula_of_string s = 
   FormulaParser.parse_formula Lexer.lex (Lexing.from_string s)
 
-
 let real_expr_of_string s = 
   FormulaParser.parse_real_expr Lexer.lex (Lexing.from_string s)
-
 
 let struc_of_string s = 
   StructureParser.parse_structure Lexer.lex (Lexing.from_string s)
@@ -53,6 +51,8 @@
 	"{ y->1{ x->2, x->3 } , y->2{ x->1, x->3 } , y->3{ x->1, x->2 }  }";
       eval_eq "[ | R { (a, a); (a, c) } | ]" "R (x, y) and not x = y" 
 	"{ y->2{ x->1 }  }";
+      eval_eq "[ e1 | R:1 {e2} ; .c = e1 | ]" "x = .c" "{ .c->1{ x->1 }  }";
+      eval_eq "[ e1, e2 | .c = e1 ; .d = e2 | ]" ".c = .d" "{}";
     );
 
   "eval: first-order with quantifiers" >::
@@ -275,6 +275,7 @@
 	"Sum (x, y | true : :f(x) * :f(y))" 36.;
       real_val_eq "[ | R { (a, a); (a, b) } | ] " 
 	"Sum (x, y | R (x, y) : 1)" 2.;
+      real_val_eq "[ a, b | .c = b | f { a->1, b->2 } ]" ":f(.c)" 2.;
     );
 
   "structure with rels parsing" >::