Index: regression/gifu03.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/gifu03.tst,v
retrieving revision 1.9
diff -u -r1.9 gifu03.tst
--- regression/gifu03.tst	16 Sep 2005 22:53:40 -0000	1.9
+++ regression/gifu03.tst	20 Oct 2005 21:45:38 -0000
@@ -31,7 +31,7 @@
 # G18 misses the point. More important to cover cut at L17.
 loadsgf games/cgf2003/GnuGo-GORO.sgf 116
 105 restricted_genmove white G18 H17 H16 J16 K16 K17 L16 L17 F17 F16 H18
-#? [!G18|F17|F16|H18]*
+#? [H17|H16|J16|K16|K17|L16|L17]*
 
 # H1 2 points sente.
 loadsgf games/cgf2003/GnuGo-GORO.sgf 174
@@ -224,7 +224,7 @@
 # O19 is not the right move if we want to reduce the aji of O18.
 loadsgf games/cgf2003/GnuGo-Katsunari.sgf 71
 701 restricted_genmove black O19 M18 L18 L17
-#? [!O19]
+#? [M18|L18|L17]
 
 # N6 locally better than M6.
 loadsgf games/cgf2003/GnuGo-Katsunari.sgf 107
Index: regression/manyfaces.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/manyfaces.tst,v
retrieving revision 1.23
diff -u -r1.23 manyfaces.tst
--- regression/manyfaces.tst	28 May 2004 03:09:14 -0000	1.23
+++ regression/manyfaces.tst	20 Oct 2005 21:45:38 -0000
@@ -21,8 +21,8 @@
 #? [S12]*
 
 loadsgf games/mfgg1.sgf 97
-4 reg_genmove black
-#? [!T6]
+4 restricted_genmove black T6 R5
+#? [R5]
 
 #CATEGORY=FUSEKI_STRATEGY
 #DESCRIPTION=N6 is not terrible - right concept.
Index: regression/strategy.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/strategy.tst,v
retrieving revision 1.66
diff -u -r1.66 strategy.tst
--- regression/strategy.tst	13 Jun 2005 03:35:08 -0000	1.66
+++ regression/strategy.tst	20 Oct 2005 21:45:38 -0000
@@ -12,13 +12,14 @@
 2 reg_genmove black
 #? [!G2|D2]
 
-loadsgf games/strategy2.sgf 9
-3 reg_genmove black
-#? [!H1|H2]
-
-loadsgf games/strategy2.sgf 11
-4 reg_genmove black
-#? [!F1]
+# # Current GNU Go would never play those moves. Removed.
+# loadsgf games/strategy2.sgf 9
+# 3 reg_genmove black
+# #? [!H1|H2]
+# 
+# loadsgf games/strategy2.sgf 11
+# 4 reg_genmove black
+# #? [!F1]
 
 loadsgf games/strategy3.sgf 14
 5 reg_genmove white
@@ -112,9 +113,10 @@
 18 restricted_genmove black E4 E5 F3 N3
 #? [E4|F3]
 
-loadsgf games/strategy4.sgf
-19 reg_genmove black
-#? [!PASS]
+# # Current GNU Go would never consider passing here. Removed.
+# loadsgf games/strategy4.sgf
+# 19 reg_genmove black
+# #? [!PASS]
 
 
 #CATEGORY=OWL_TUNING
@@ -174,22 +176,22 @@
 #? [C3]
 
 loadsgf games/strategy5.sgf 20
-28 reg_genmove black
-#? [!F2]
+28 restricted_genmove black G3 F2
+#? [G3]
 
 loadsgf games/strategy5.sgf 40
 29 reg_genmove black
 #? [R4]*
 
 loadsgf games/strategy5.sgf 44
-30 reg_genmove black
-#? [!T7]
+30 restricted_genmove black T7 S4
+#? [S4]
 
 # This is a problem with the semeai analyzer and revise_semeai().
 # But there is no semeai.
 loadsgf games/strategy6.sgf 274
 31 reg_genmove black
-#? [!(K19|D17|E16|E15)]
+#? [PASS]
 
 loadsgf games/strategy7.sgf 23
 32 reg_genmove black
@@ -204,21 +206,21 @@
 #? [E17]
 
 loadsgf games/nicklas/nicklas8.sgf 80
-35 reg_genmove black
-#? [!B17]
+35 restricted_genmove black B17 H17
+#? [H17]
 
 loadsgf games/nicklas/nicklas8.sgf 82
-36 reg_genmove black
-#? [!D18]
+36 restricted_genmove black H17 D18
+#? [H17]
 
 loadsgf games/nicklas/nicklas8.sgf 84
-37 reg_genmove black
-#? [!A17|A18|C19]
+37 restricted_genmove black A17 A18 C19 H17
+#? [H17]
 
 # The life code solves this mistake.
 loadsgf games/nicklas/nicklas8.sgf 86
-38 reg_genmove black
-#? [!B19]
+38 restricted_genmove black H17 B19
+#? [H17]
 
 loadsgf games/nicklas/nicklas8.sgf 96
 39 reg_genmove black