Flattening tests. Not claiming any particular language.

57 files changed, 459 insertions, 768 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 2c89a76c..4d0f3ca5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,7 @@
-DIST_SUBDIRS =  python cxx ruby
-
 TESTS = runtests.mk
 
 TEST_CASES = \
+	ambig1.lm \
 	backtrack1.lm \
 	backtrack2.lm \
 	backtrack3.lm \
@@ -22,6 +21,8 @@ TEST_CASES = \
 	construct1.lm \
 	construct2.lm \
 	construct3.lm \
+	generate1.lm \
+	lookup1.lm \
 	treecmp1.lm \
 	context1.lm \
 	context2.lm \
@@ -51,7 +52,10 @@ TEST_CASES = \
 	counting3.lm \
 	counting4.lm \
 	til.lm \
-	tags.lm \
+	tags1.lm \
+	tags2.lm \
+	tags3.lm \
+	tags4.lm \
 	matchex.lm \
 	maxlen.lm \
 	superid.lm \
@@ -65,6 +69,7 @@ TEST_CASES = \
 	multiregion2.lm
 
 INPUT = \
+	ambig1.in \
 	accum1.in \
 	accum2.in \
 	backtrack1.in \
@@ -80,6 +85,8 @@ INPUT = \
 	counting2.in \
 	counting3.in \
 	counting4.in \
+	generate1.in \
+	lookup1.in \
 	binary1.in \
 	func.in \
 	heredoc.in \
@@ -99,7 +106,10 @@ INPUT = \
 	rubyhere.in \
 	string.in \
 	superid.in \
-	tags.in \
+	tags1.in \
+	tags2.in \
+	tags3.in \
+	tags4.in \
 	til.in \
 	translate1.in \
 	translate2.in \
@@ -114,6 +124,7 @@ INPUT = \
 	multiregion2.in
 
 EXPECTED_OUTPUT = \
+	ambig1.exp \
 	accum1.exp \
 	accum2.exp \
 	accum3.exp \
@@ -137,6 +148,8 @@ EXPECTED_OUTPUT = \
 	counting2.exp \
 	counting3.exp \
 	counting4.exp \
+	generate1.exp \
+	lookup1.exp \
 	div.exp \
 	binary1.exp \
 	exit1.exp \
@@ -162,7 +175,10 @@ EXPECTED_OUTPUT = \
 	sprintf.exp \
 	string.exp \
 	superid.exp \
-	tags.exp \
+	tags1.exp \
+	tags2.exp \
+	tags3.exp \
+	tags4.exp \
 	til.exp \
 	translate1.exp \
 	translate2.exp \
diff --git a/test/TESTS b/test/TESTS
index eaf93902..1be32a0f 100644
--- a/test/TESTS
+++ b/test/TESTS
@@ -1,13 +1,10 @@
 #!/bin/bash
 #
 
-SUBDIRS="
-	python
-	cxx
-	ruby
-"
+SUBDIRS=""
 
 TESTS="
+	ambig1.lm
 	backtrack1.lm
 	backtrack2.lm
 	backtrack3.lm
@@ -27,6 +24,8 @@ TESTS="
 	construct1.lm
 	construct2.lm
 	construct3.lm
+	generate1.lm
+	lookup1.lm
 	treecmp1.lm
 	context1.lm
 	context2.lm
diff --git a/test/ruby/ruby01.rb.exp b/test/ambig1.exp
index 7aafbddd..7aafbddd 100644
--- a/test/ruby/ruby01.rb.exp
+++ b/test/ambig1.exp
diff --git a/test/ruby/ruby01.rb.in b/test/ambig1.in
index e69de29b..e69de29b 100644
--- a/test/ruby/ruby01.rb.in
+++ b/test/ambig1.in
diff --git a/test/ruby/ruby.lm b/test/ambig1.lm
index ef31d900..ef31d900 100644
--- a/test/ruby/ruby.lm
+++ b/test/ambig1.lm
diff --git a/test/cxx/Makefile.am b/test/cxx/Makefile.am
deleted file mode 100644
index 1ea42064..00000000
--- a/test/cxx/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-TEST_CASES = cxx.lm 
-
-INPUT = \
-	cxx01.cpp.in \
-	cxx02.cpp.in \
-	cxx03.cpp.in \
-	cxx04.cpp.in \
-	cxx05.cpp.in \
-	cxx06.cpp.in \
-	cxx07.cpp.in \
-	cxx08.cpp.in \
-	cxx09.cpp.in \
-	cxx10.cpp.in \
-	cxx11.cpp.in \
-	cxx12.cpp.in \
-	cxx13.cpp.in
-
-OUTPUT = \
-	cxx01.cpp.exp \
-	cxx02.cpp.exp \
-	cxx03.cpp.exp \
-	cxx04.cpp.exp \
-	cxx05.cpp.exp \
-	cxx06.cpp.exp \
-	cxx07.cpp.exp \
-	cxx08.cpp.exp \
-	cxx09.cpp.exp \
-	cxx10.cpp.exp \
-	cxx11.cpp.exp \
-	cxx12.cpp.exp \
-	cxx13.cpp.exp
-
-EXTRA_DIST = TESTS runtests.mk $(TEST_CASES) $(INPUT) $(OUTPUT)
diff --git a/test/cxx/TESTS b/test/cxx/TESTS
deleted file mode 100644
index 5e159c24..00000000
--- a/test/cxx/TESTS
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-
-TESTS="
-	cxx.lm
-"
diff --git a/test/cxx/cxx01.cpp.exp b/test/cxx/cxx01.cpp.exp
deleted file mode 100644
index 50363624..00000000
--- a/test/cxx/cxx01.cpp.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><namespace_definition><named_namespace_definition><original_namespace_definition><orig_namespace_def_name><_literal_0004>namespace</_literal_0004><unknown_id><lookup_id>ns1</lookup_id></unknown_id></orig_namespace_def_name><_literal_0045>{</_literal_0045><_repeat_declaration><declaration><namespace_definition><named_namespace_definition><original_namespace_definition><orig_namespace_def_name><_literal_0004>namespace</_literal_0004><unknown_id><lookup_id>sub1</lookup_id></unknown_id></orig_namespace_def_name><_literal_0045>{</_literal_0045><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>A</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration><namespace_end></namespace_end><_literal_0046>}</_literal_0046></original_namespace_definition></named_namespace_definition></namespace_definition></declaration><declaration><namespace_definition><named_namespace_definition><original_namespace_definition><orig_namespace_def_name><_literal_0004>namespace</_literal_0004><unknown_id><lookup_id>sub2</lookup_id></unknown_id></orig_namespace_def_name><_literal_0045>{</_literal_0045><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>B</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration><namespace_end></namespace_end><_literal_0046>}</_literal_0046></original_namespace_definition></named_namespace_definition></namespace_definition></declaration></_repeat_declaration><namespace_end></namespace_end><_literal_0046>}</_literal_0046></original_namespace_definition></named_namespace_definition></namespace_definition></declaration><declaration><namespace_definition><named_namespace_definition><original_namespace_definition><orig_namespace_def_name><_literal_0004>namespace</_literal_0004><unknown_id><lookup_id>ns2</lookup_id></unknown_id></orig_namespace_def_name><_literal_0045>{</_literal_0045><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><using_directive><_literal_0018>using</_literal_0018><_literal_0004>namespace</_literal_0004><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><namespace_id><lookup_id>ns1</lookup_id></namespace_id><_literal_0047>;</_literal_0047></using_directive></block_declaration></declaration></_repeat_declaration><namespace_end></namespace_end><_literal_0046>}</_literal_0046></original_namespace_definition></named_namespace_definition></namespace_definition></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><namespace_id><lookup_id>ns2</lookup_id></namespace_id></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><qualifying_name><namespace_id><lookup_id>sub1</lookup_id></namespace_id></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>A</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>a</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  a
-  ns1 {
-    sub1 {
-      A
-    }
-    sub2 {
-      B
-    }
-  }
-  ns2 {
-    C
-  }
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx01.cpp.in b/test/cxx/cxx01.cpp.in
deleted file mode 100644
index e2b125f4..00000000
--- a/test/cxx/cxx01.cpp.in
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace ns1
-{
-	namespace sub1 { class A {}; }
-	namespace sub2 { class B {}; }
-}
-
-namespace ns2
-{
-//	int i = b;
-	class C
-	{
-	};
-
-	using namespace ns1;
-}
-
-ns2::sub1::A a;
diff --git a/test/cxx/cxx02.cpp.exp b/test/cxx/cxx02.cpp.exp
deleted file mode 100644
index 2ae86386..00000000
--- a/test/cxx/cxx02.cpp.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>A</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>B</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>D</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt><base_clause><_literal_004c>:</_literal_004c><base_specifier_list><base_specifier><_literal_000c>virtual</_literal_000c><access_specifier_opt><access_specifier><_literal_0017>public</_literal_0017></access_specifier></access_specifier_opt><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>A</lookup_id></class_id></class_name></type_name></base_specifier></base_specifier_list></base_clause></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>D</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>A</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>d</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>c</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  A {
-    B
-  }
-  C {
-    D
-  }
-  c
-  d
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx02.cpp.in b/test/cxx/cxx02.cpp.in
deleted file mode 100644
index 65ebe0db..00000000
--- a/test/cxx/cxx02.cpp.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-struct A
-{
-	struct B {};
-};
-
-struct C
-{
-	struct D : virtual public A {};
-};
-
-C::D::A d;
-
-C c;
-
-
diff --git a/test/cxx/cxx03.cpp.exp b/test/cxx/cxx03.cpp.exp
deleted file mode 100644
index a16c6c8f..00000000
--- a/test/cxx/cxx03.cpp.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><enum_specifier><_literal_0024>enum</_literal_0024><nested_name_specifier_opt></nested_name_specifier_opt><enum_head_name><unknown_id><lookup_id>E</lookup_id></unknown_id></enum_head_name><_literal_0045>{</_literal_0045><enumerator_list_opt><enumerator_list><enumerator_list><enumerator_definition><enumerator_id><class_id><lookup_id>C</lookup_id></class_id></enumerator_id></enumerator_definition></enumerator_list><_literal_0048>,</_literal_0048><enumerator_definition><enumerator_id><unknown_id><lookup_id>b</lookup_id></unknown_id></enumerator_id></enumerator_definition></enumerator_list></enumerator_list_opt><_literal_0046>}</_literal_0046></enum_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><enum_id><lookup_id>E</lookup_id></enum_id></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>e</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><enum_specifier><_literal_0024>enum</_literal_0024><nested_name_specifier_opt></nested_name_specifier_opt><enum_head_name><enum_id><lookup_id>E</lookup_id></enum_id></enum_head_name><_literal_0045>{</_literal_0045><enumerator_list_opt><enumerator_list><enumerator_list><enumerator_definition><enumerator_id><class_id><lookup_id>C</lookup_id></class_id></enumerator_id></enumerator_definition></enumerator_list><_literal_0048>,</_literal_0048><enumerator_definition><enumerator_id><identifier><lookup_id>b</lookup_id></identifier></enumerator_id></enumerator_definition></enumerator_list></enumerator_list_opt><_literal_0046>}</_literal_0046></enum_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C
-  C
-  C
-  E
-  E
-  b
-  b
-  e
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx03.cpp.in b/test/cxx/cxx03.cpp.in
deleted file mode 100644
index bccfbf0e..00000000
--- a/test/cxx/cxx03.cpp.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-struct C
-{
-
-};
-
-enum E
-{
-	C,
-	b
-};
-
-E e;
-
-enum E
-{
-	C,
-	b
-};
diff --git a/test/cxx/cxx04.cpp.exp b/test/cxx/cxx04.cpp.exp
deleted file mode 100644
index 593798df..00000000
--- a/test/cxx/cxx04.cpp.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>j</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>D</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><_literal_0051>~</_literal_0051><class_name><class_id><lookup_id>D</lookup_id></class_id></class_name></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><unknown_id><lookup_id>k</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><_literal_0051>~</_literal_0051><unknown_id><lookup_id>C</lookup_id></unknown_id></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_mult><_literal_0006>typedef</_literal_0006></decl_specifier_mult></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>Int</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    j
-  }
-  D
-  i
-  Int
-}
-***** UNKNOWN DECLARATORS *****
-C
diff --git a/test/cxx/cxx04.cpp.in b/test/cxx/cxx04.cpp.in
deleted file mode 100644
index 9741a82b..00000000
--- a/test/cxx/cxx04.cpp.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-int i;
-class C
-{
-	int j;
-};
-
-class D
-{
-	int ~D();
-};
-
-int C::k;
-int C::~C;
-
-typedef int Int;
diff --git a/test/cxx/cxx05.cpp.exp b/test/cxx/cxx05.cpp.exp
deleted file mode 100644
index b4b9eb67..00000000
--- a/test/cxx/cxx05.cpp.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><_literal_0051>~</_literal_0051><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><operator_function_id><_literal_0027>operator</_literal_0027><operator><_literal_0052>+</_literal_0052></operator></operator_function_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start><parameter_declaration_list><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C
-  C
-  i
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx05.cpp.in b/test/cxx/cxx05.cpp.in
deleted file mode 100644
index 7936ce09..00000000
--- a/test/cxx/cxx05.cpp.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-class C {};
-void ~C( );
-void C::operator +( int i );
-
-int i;
-
-//void operator C( void k );
diff --git a/test/cxx/cxx06.cpp.exp b/test/cxx/cxx06.cpp.exp
deleted file mode 100644
index 3b6db1e9..00000000
--- a/test/cxx/cxx06.cpp.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start><parameter_declaration_list><parameter_declaration_list><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list><_literal_0048>,</_literal_0048><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>j</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start><parameter_declaration_list><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>v</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx06.cpp.in b/test/cxx/cxx06.cpp.in
deleted file mode 100644
index 008edd4b..00000000
--- a/test/cxx/cxx06.cpp.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-class C
-{
-	
-};
-
-int C::f( int i, int j( void v ) );
diff --git a/test/cxx/cxx07.cpp.exp b/test/cxx/cxx07.cpp.exp
deleted file mode 100644
index 8683450c..00000000
--- a/test/cxx/cxx07.cpp.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>D</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_mult><_literal_0006>typedef</_literal_0006></decl_specifier_mult></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>I</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><typedef_id><lookup_id>I</lookup_id></typedef_id></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>D</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>c</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><function_definition><function_def_declaration><declaration_start></declaration_start><function_def_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><function_def_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>function</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start><parameter_declaration_list><parameter_declaration_list><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list><_literal_0048>,</_literal_0048><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>j</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></function_def_declarator></function_def_declaration_forms><declaration_end></declaration_end></function_def_declaration><ctor_initializer_opt></ctor_initializer_opt><function_body><function_body_begin></function_body_begin><_literal_0045>{</_literal_0045><statement_rep><statement_rep></statement_rep><statement><expression_statement><expression><assignment_expression><conditional_expression><logical_or_expression><logical_and_expression><inclusive_or_expression><exclusive_or_expression><and_expression><equality_expression><relational_expression><shift_expression><additive_expression><multiplicative_expression><pm_expression><cast_expression><unary_expression><postfix_expression><postfix_expression><primary_expression><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><identifier><lookup_id>function</lookup_id></identifier></id_expression></primary_expression></postfix_expression><_literal_004a>(</_literal_004a><expression_opt></expression_opt><_literal_004b>)</_literal_004b></postfix_expression></unary_expression></cast_expression></pm_expression></multiplicative_expression></additive_expression></shift_expression></relational_expression></equality_expression></and_expression></exclusive_or_expression></inclusive_or_expression></logical_and_expression></logical_or_expression></conditional_expression></assignment_expression></expression><_literal_0047>;</_literal_0047></expression_statement></statement></statement_rep><function_body_end></function_body_end><_literal_0046>}</_literal_0046></function_body><function_def_end></function_def_end></function_definition></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    D
-    I
-    i
-  }
-  c
-  function
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx07.cpp.in b/test/cxx/cxx07.cpp.in
deleted file mode 100644
index afd06440..00000000
--- a/test/cxx/cxx07.cpp.in
+++ /dev/null
@@ -1,18 +0,0 @@
-class C 
-{
-	class D {};
-
-	typedef C I;
-
-	I::D i;
-};
-
-C c;
-
-void function( int i, int j )
-{
-	function();
-}
-
-
-
diff --git a/test/cxx/cxx08.cpp.exp b/test/cxx/cxx08.cpp.exp
deleted file mode 100644
index f356a7af..00000000
--- a/test/cxx/cxx08.cpp.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>B</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>Find</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_mult><_literal_0006>typedef</_literal_0006></decl_specifier_mult></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>B</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>T</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt><base_clause><_literal_004c>:</_literal_004c><base_specifier_list><base_specifier><access_specifier><_literal_0017>public</_literal_0017></access_specifier><virtual_opt></virtual_opt><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><typedef_id><lookup_id>T</lookup_id></typedef_id></type_name></base_specifier></base_specifier_list></base_clause></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>Find</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>find</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  B {
-    Find
-  }
-  C {
-    find
-  }
-  T
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx08.cpp.in b/test/cxx/cxx08.cpp.in
deleted file mode 100644
index 2e9ec7a0..00000000
--- a/test/cxx/cxx08.cpp.in
+++ /dev/null
@@ -1,13 +0,0 @@
-class B { class Find {}; };
-
-typedef B T;
-
-class C : public T
-{
-	Find find;
-};
-
-
-
-
-
diff --git a/test/cxx/cxx09.cpp.exp b/test/cxx/cxx09.cpp.exp
deleted file mode 100644
index 9fb4dc88..00000000
--- a/test/cxx/cxx09.cpp.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><template_declaration><template_declaration_params><_literal_0014>template</_literal_0014><_literal_0055>&lt;</_literal_0055><tpl_start></tpl_start><template_parameter_list><template_parameter><type_parameter><_literal_0011>class</_literal_0011><type_param_id><unknown_id><lookup_id>X</lookup_id></unknown_id></type_param_id><type_param_init_opt></type_param_init_opt></type_parameter></template_parameter></template_parameter_list><_literal_0056>&gt;</_literal_0056></template_declaration_params><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>X</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>t</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></template_declaration></declaration><declaration><template_declaration><template_declaration_params><_literal_0014>template</_literal_0014><_literal_0055>&lt;</_literal_0055><tpl_start></tpl_start><template_parameter_list><template_parameter><type_parameter><_literal_0011>class</_literal_0011><type_param_id><unknown_id><lookup_id>X</lookup_id></unknown_id></type_param_id><type_param_init_opt></type_param_init_opt></type_parameter></template_parameter></template_parameter_list><_literal_0056>&gt;</_literal_0056></template_declaration_params><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><templ_class_id><lookup_id>C</lookup_id></templ_class_id><templ_arg_open><_literal_0055>&lt;</_literal_0055></templ_arg_open><template_argument_list_opt><template_argument_list><template_argument><type_id><type_specifier_seq><type_specifier_mult_seq_opt></type_specifier_mult_seq_opt><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>X</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing><type_specifier_mult_seq_opt></type_specifier_mult_seq_opt></type_specifier_seq><abstract_declarator_opt></abstract_declarator_opt></type_id></template_argument></template_argument_list></template_argument_list_opt><templ_arg_close><_literal_0056>&gt;</_literal_0056></templ_arg_close></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><identifier><lookup_id>f</lookup_id></identifier></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></template_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    f
-    t
-  }
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx09.cpp.in b/test/cxx/cxx09.cpp.in
deleted file mode 100644
index 373f4373..00000000
--- a/test/cxx/cxx09.cpp.in
+++ /dev/null
@@ -1,7 +0,0 @@
-template <class X> struct C
-{
-	X t;
-	void f();
-};
-
-template <class X> void C<X>::f();
diff --git a/test/cxx/cxx10.cpp.exp b/test/cxx/cxx10.cpp.exp
deleted file mode 100644
index 86127104..00000000
--- a/test/cxx/cxx10.cpp.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><template_declaration><template_declaration_params><_literal_0014>template</_literal_0014><_literal_0055>&lt;</_literal_0055><tpl_start></tpl_start><template_parameter_list><template_parameter><type_parameter><_literal_0011>class</_literal_0011><type_param_id><unknown_id><lookup_id>X</lookup_id></unknown_id></type_param_id><type_param_init_opt></type_param_init_opt></type_parameter></template_parameter></template_parameter_list><_literal_0056>&gt;</_literal_0056></template_declaration_params><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0012>struct</_literal_0012></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>Y</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></template_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><templ_class_id><lookup_id>C</lookup_id></templ_class_id><templ_arg_open><_literal_0055>&lt;</_literal_0055></templ_arg_open><template_argument_list_opt><template_argument_list><template_argument><type_id><type_specifier_seq><type_specifier_mult_seq_opt></type_specifier_mult_seq_opt><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing><type_specifier_mult_seq_opt></type_specifier_mult_seq_opt></type_specifier_seq><abstract_declarator_opt></abstract_declarator_opt></type_id></template_argument></template_argument_list></template_argument_list_opt><templ_arg_close><_literal_0056>&gt;</_literal_0056></templ_arg_close></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>i</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    Y
-  }
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx10.cpp.in b/test/cxx/cxx10.cpp.in
deleted file mode 100644
index 98b6a96a..00000000
--- a/test/cxx/cxx10.cpp.in
+++ /dev/null
@@ -1,11 +0,0 @@
-template <class X> struct C
-{
-	class Y {};
-};
-
-class C<int>
-{
-	int i;
-};
-
-//void f( class C<int> i, int j );
diff --git a/test/cxx/cxx11.cpp.exp b/test/cxx/cxx11.cpp.exp
deleted file mode 100644
index 77e05120..00000000
--- a/test/cxx/cxx11.cpp.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start><parameter_declaration_list><parameter_declaration_list><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator><abstract_declarator><_literal_004a>(</_literal_004a><sub_abstract_declarator><ptr_operator_seq><ptr_operator><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><_literal_004e>*</_literal_004e><cv_qualifier_rep></cv_qualifier_rep></ptr_operator></ptr_operator_seq><abstract_noid></abstract_noid><abstract_decl_array_or_param_seq_opt></abstract_decl_array_or_param_seq_opt></sub_abstract_declarator><_literal_004b>)</_literal_004b><abstract_decl_array_or_param_seq_opt><abstract_decl_array_or_param_seq_opt><abstract_decl_array_or_param_seq_opt></abstract_decl_array_or_param_seq_opt><abstract_decl_array_or_param><_literal_004f>[</_literal_004f><constant_expression_opt></constant_expression_opt><_literal_0050>]</_literal_0050></abstract_decl_array_or_param></abstract_decl_array_or_param_seq_opt><abstract_decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></abstract_decl_array_or_param></abstract_decl_array_or_param_seq_opt><declarator_end></declarator_end></abstract_declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list><_literal_0048>,</_literal_0048><parameter_declaration><declaration_start></declaration_start><parameter_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><param_maybe_declarator></param_maybe_declarator><maybe_parameter_init></maybe_parameter_init></parameter_declaration_forms><declaration_end></declaration_end></parameter_declaration></parameter_declaration_list></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  f
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx11.cpp.in b/test/cxx/cxx11.cpp.in
deleted file mode 100644
index d9714571..00000000
--- a/test/cxx/cxx11.cpp.in
+++ /dev/null
@@ -1,2 +0,0 @@
-
-int f( int (*) [](), void );
diff --git a/test/cxx/cxx12.cpp.exp b/test/cxx/cxx12.cpp.exp
deleted file mode 100644
index e00014e4..00000000
--- a/test/cxx/cxx12.cpp.exp
+++ /dev/null
@@ -1,10 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>D</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_0019>void</_literal_0019></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>g</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    D
-    g
-  }
-  f
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx12.cpp.in b/test/cxx/cxx12.cpp.in
deleted file mode 100644
index 46e3dec7..00000000
--- a/test/cxx/cxx12.cpp.in
+++ /dev/null
@@ -1,8 +0,0 @@
-void f();
-class C
-{
-	class D {};
-	void g();
-};
-
-//typename C c;
diff --git a/test/cxx/cxx13.cpp.exp b/test/cxx/cxx13.cpp.exp
deleted file mode 100644
index 970d7862..00000000
--- a/test/cxx/cxx13.cpp.exp
+++ /dev/null
@@ -1,10 +0,0 @@
-***** SUCCESS *****
-<start><_repeat_declaration><declaration><block_declaration><simple_declaration><declaration_start></declaration_start><simple_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>C</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep><class_member_rep><class_member_rep></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><class_specifier><class_head><class_key><_literal_0011>class</_literal_0011></class_key><nested_name_specifier_opt></nested_name_specifier_opt><class_head_name><unknown_id><lookup_id>D</lookup_id></unknown_id></class_head_name></class_head><base_clause_opt></base_clause_opt><_literal_0045>{</_literal_0045><class_member_rep></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_member><member_declaration><declaration_start></declaration_start><member_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><member_declarator_list_opt><member_declarator_list><member_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></member_declarator></member_declarator_list></member_declarator_list_opt></member_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></member_declaration></class_member></class_member_rep><class_body_end></class_body_end><_literal_0046>}</_literal_0046></class_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt></init_declarator_list_opt></simple_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></simple_declaration></block_declaration></declaration><declaration><function_definition><function_def_declaration><declaration_start></declaration_start><function_def_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><function_def_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>f</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></function_def_declarator></function_def_declaration_forms><declaration_end></declaration_end></function_def_declaration><ctor_initializer_opt></ctor_initializer_opt><function_body><function_body_begin></function_body_begin><_literal_0045>{</_literal_0045><statement_rep></statement_rep><function_body_end></function_body_end><_literal_0046>}</_literal_0046></function_body><function_def_end></function_def_end></function_definition></declaration><declaration><function_definition><function_def_declaration><declaration_start></declaration_start><function_def_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_kw_seq><simple_type_specifier_kw><_literal_001d>int</_literal_001d></simple_type_specifier_kw></simple_type_specifier_kw_seq></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><function_def_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt><nested_name_specifier_opt></nested_name_specifier_opt><qualifying_name><class_name><class_id><lookup_id>C</lookup_id></class_id></class_name></qualifying_name><_literal_005d>::</_literal_005d></nested_name_specifier_opt><identifier><lookup_id>f</lookup_id></identifier></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep><decl_array_or_param_rep></decl_array_or_param_rep><decl_array_or_param><_literal_004a>(</_literal_004a><parameter_declaration_clause><pdc_start></pdc_start></parameter_declaration_clause><_literal_004b>)</_literal_004b><cv_qualifier_rep></cv_qualifier_rep><exception_specification_opt></exception_specification_opt></decl_array_or_param></decl_array_or_param_rep><declarator_end></declarator_end></declarator></function_def_declarator></function_def_declaration_forms><declaration_end></declaration_end></function_def_declaration><ctor_initializer_opt></ctor_initializer_opt><function_body><function_body_begin></function_body_begin><_literal_0045>{</_literal_0045><statement_rep><statement_rep></statement_rep><statement><declaration_statement><stmt_block_declaration><declaration_start></declaration_start><stmt_block_declaration_forms><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><decl_specifier_sing><type_specifier_sing><simple_type_specifier><simple_type_specifier_name><qual_type_name><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><type_name><class_name><class_id><lookup_id>D</lookup_id></class_id></class_name></type_name></qual_type_name></simple_type_specifier_name></simple_type_specifier></type_specifier_sing></decl_specifier_sing><decl_specifier_mult_seq_opt></decl_specifier_mult_seq_opt><init_declarator_list_opt><init_declarator_list><init_declarator><declarator><ptr_operator_seq_opt></ptr_operator_seq_opt><declarator_id><declarator_id_forms><id_expression><root_qual_opt></root_qual_opt><nested_name_specifier_opt></nested_name_specifier_opt><unknown_id><lookup_id>d</lookup_id></unknown_id></id_expression></declarator_id_forms></declarator_id><decl_array_or_param_rep></decl_array_or_param_rep><declarator_end></declarator_end></declarator><initializer_opt></initializer_opt></init_declarator></init_declarator_list></init_declarator_list_opt></stmt_block_declaration_forms><declaration_end></declaration_end><_literal_0047>;</_literal_0047></stmt_block_declaration></declaration_statement></statement></statement_rep><function_body_end></function_body_end><_literal_0046>}</_literal_0046></function_body><function_def_end></function_def_end></function_definition></declaration></_repeat_declaration></start>***** NAMSPACES *****
-<root_namespace> {
-  C {
-    D
-    f
-  }
-  f
-}
-***** UNKNOWN DECLARATORS *****
diff --git a/test/cxx/cxx13.cpp.in b/test/cxx/cxx13.cpp.in
deleted file mode 100644
index 67fd42fd..00000000
--- a/test/cxx/cxx13.cpp.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-class C
-{
-	class D {};
-	int f();
-};
-
-int f()
-{
-}
-int C::f()
-{
-	D d;
-}
diff --git a/test/cxx/preproc b/test/cxx/preproc
deleted file mode 100755
index 2661a197..00000000
--- a/test/cxx/preproc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-#
-
-echo 'struct __builtin_va_list {};'
-g++ -E -undef -D'__attribute__(xyz)=' "$@" | sed 's/#.*$//' | grep -v '^[ \t]*$'
diff --git a/test/cxx/runtests.mk b/test/cxx/runtests.mk
deleted file mode 100644
index 2b377cf7..00000000
--- a/test/cxx/runtests.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-SUBDIRS = 
-
-TESTS = \
-	cxx.lm
-
-DIFFS = \
-	cxx01.cpp.diff \
-	cxx02.cpp.diff \
-	cxx03.cpp.diff \
-	cxx04.cpp.diff \
-	cxx05.cpp.diff \
-	cxx06.cpp.diff \
-	cxx07.cpp.diff \
-	cxx08.cpp.diff \
-	cxx09.cpp.diff \
-	cxx10.cpp.diff \
-	cxx11.cpp.diff \
-	cxx12.cpp.diff \
-	cxx13.cpp.diff
-
-all: Makefile $(DIFFS) $(SUBDIRS)
-
-.PHONY: clean $(SUBDIRS:%=%-clean)
-clean: $(SUBDIRS:%=%-clean)
-	rm -f *.bin
-$(SUBDIRS:%=%-clean):
-	cd $(@:%-clean=%) && $(MAKE) clean
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
-	cd $@ && $(MAKE)
-
-Makefile: ../genmf TESTS
-	../genmf > Makefile
-
-cxx01.cpp.diff: cxx01.cpp.out cxx01.cpp.exp
-	@diff -u cxx01.cpp.exp cxx01.cpp.out > cxx01.cpp.diff || ( cat cxx01.cpp.diff; rm cxx01.cpp.diff )
-
-cxx01.cpp.out: cxx.bin
-	./cxx.bin  < cxx01.cpp.in > cxx01.cpp.out
-
-cxx02.cpp.diff: cxx02.cpp.out cxx02.cpp.exp
-	@diff -u cxx02.cpp.exp cxx02.cpp.out > cxx02.cpp.diff || ( cat cxx02.cpp.diff; rm cxx02.cpp.diff )
-
-cxx02.cpp.out: cxx.bin
-	./cxx.bin  < cxx02.cpp.in > cxx02.cpp.out
-
-cxx03.cpp.diff: cxx03.cpp.out cxx03.cpp.exp
-	@diff -u cxx03.cpp.exp cxx03.cpp.out > cxx03.cpp.diff || ( cat cxx03.cpp.diff; rm cxx03.cpp.diff )
-
-cxx03.cpp.out: cxx.bin
-	./cxx.bin  < cxx03.cpp.in > cxx03.cpp.out
-
-cxx04.cpp.diff: cxx04.cpp.out cxx04.cpp.exp
-	@diff -u cxx04.cpp.exp cxx04.cpp.out > cxx04.cpp.diff || ( cat cxx04.cpp.diff; rm cxx04.cpp.diff )
-
-cxx04.cpp.out: cxx.bin
-	./cxx.bin  < cxx04.cpp.in > cxx04.cpp.out
-
-cxx05.cpp.diff: cxx05.cpp.out cxx05.cpp.exp
-	@diff -u cxx05.cpp.exp cxx05.cpp.out > cxx05.cpp.diff || ( cat cxx05.cpp.diff; rm cxx05.cpp.diff )
-
-cxx05.cpp.out: cxx.bin
-	./cxx.bin  < cxx05.cpp.in > cxx05.cpp.out
-
-cxx06.cpp.diff: cxx06.cpp.out cxx06.cpp.exp
-	@diff -u cxx06.cpp.exp cxx06.cpp.out > cxx06.cpp.diff || ( cat cxx06.cpp.diff; rm cxx06.cpp.diff )
-
-cxx06.cpp.out: cxx.bin
-	./cxx.bin  < cxx06.cpp.in > cxx06.cpp.out
-
-cxx07.cpp.diff: cxx07.cpp.out cxx07.cpp.exp
-	@diff -u cxx07.cpp.exp cxx07.cpp.out > cxx07.cpp.diff || ( cat cxx07.cpp.diff; rm cxx07.cpp.diff )
-
-cxx07.cpp.out: cxx.bin
-	./cxx.bin  < cxx07.cpp.in > cxx07.cpp.out
-
-cxx08.cpp.diff: cxx08.cpp.out cxx08.cpp.exp
-	@diff -u cxx08.cpp.exp cxx08.cpp.out > cxx08.cpp.diff || ( cat cxx08.cpp.diff; rm cxx08.cpp.diff )
-
-cxx08.cpp.out: cxx.bin
-	./cxx.bin  < cxx08.cpp.in > cxx08.cpp.out
-
-cxx09.cpp.diff: cxx09.cpp.out cxx09.cpp.exp
-	@diff -u cxx09.cpp.exp cxx09.cpp.out > cxx09.cpp.diff || ( cat cxx09.cpp.diff; rm cxx09.cpp.diff )
-
-cxx09.cpp.out: cxx.bin
-	./cxx.bin  < cxx09.cpp.in > cxx09.cpp.out
-
-cxx10.cpp.diff: cxx10.cpp.out cxx10.cpp.exp
-	@diff -u cxx10.cpp.exp cxx10.cpp.out > cxx10.cpp.diff || ( cat cxx10.cpp.diff; rm cxx10.cpp.diff )
-
-cxx10.cpp.out: cxx.bin
-	./cxx.bin  < cxx10.cpp.in > cxx10.cpp.out
-
-cxx11.cpp.diff: cxx11.cpp.out cxx11.cpp.exp
-	@diff -u cxx11.cpp.exp cxx11.cpp.out > cxx11.cpp.diff || ( cat cxx11.cpp.diff; rm cxx11.cpp.diff )
-
-cxx11.cpp.out: cxx.bin
-	./cxx.bin  < cxx11.cpp.in > cxx11.cpp.out
-
-cxx12.cpp.diff: cxx12.cpp.out cxx12.cpp.exp
-	@diff -u cxx12.cpp.exp cxx12.cpp.out > cxx12.cpp.diff || ( cat cxx12.cpp.diff; rm cxx12.cpp.diff )
-
-cxx12.cpp.out: cxx.bin
-	./cxx.bin  < cxx12.cpp.in > cxx12.cpp.out
-
-cxx13.cpp.diff: cxx13.cpp.out cxx13.cpp.exp
-	@diff -u cxx13.cpp.exp cxx13.cpp.out > cxx13.cpp.diff || ( cat cxx13.cpp.diff; rm cxx13.cpp.diff )
-
-cxx13.cpp.out: cxx.bin
-	./cxx.bin  < cxx13.cpp.in > cxx13.cpp.out
-
-cxx.bin: cxx.lm ../../colm/colm
-	../../colm/colm cxx.lm
diff --git a/test/generate1.exp b/test/generate1.exp
new file mode 100644
index 00000000..8376e747
--- /dev/null
+++ b/test/generate1.exp
@@ -0,0 +1,136 @@
+*** SUCCESS ***
+
+hello
+def dude():
+    yes
+    awesome;
+
+    # Here we have a comment
+    def realy_awesome(): # hi there
+      in_more
+
+      same_level 
+      def one_liner(): first; second # both inside one_liner
+
+    back_down
+
+last_statement
+
+# dude, this is a comment
+ # some more
+hello
+if 1:
+    yes
+    awesome;
+
+    # Here we have a comment
+    if ('hello'): # hi there
+      in_more
+
+      same_level 
+      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
+      1
+
+    back_down
+
+last_statement
+
+hello = 1.1(20);
+
+# subscription
+a[1] = b[2];
+
+# simple slicing
+c[1:1] = d[2:2];
+
+# simple slicing
+e[1:1, 2:2] = f[3:3, 4:4];
+***
+STMT: hello
+STMT: def dude():
+    yes
+    awesome;
+
+    # Here we have a comment
+    def realy_awesome(): # hi there
+      in_more
+
+      same_level 
+      def one_liner(): first; second # both inside one_liner
+
+    back_down
+
+STMT: yes
+STMT: awesome;
+
+    # Here we have a comment
+STMT: def realy_awesome(): # hi there
+      in_more
+
+      same_level 
+      def one_liner(): first; second # both inside one_liner
+
+STMT: in_more
+
+STMT: same_level 
+STMT: def one_liner(): first; second # both inside one_liner
+
+STMT: back_down
+
+STMT: last_statement
+
+# dude, this is a comment
+ # some more
+STMT: hello
+STMT: if 1:
+    yes
+    awesome;
+
+    # Here we have a comment
+    if ('hello'): # hi there
+      in_more
+
+      same_level 
+      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
+      1
+
+    back_down
+
+STMT: yes
+STMT: awesome;
+
+    # Here we have a comment
+STMT: if ('hello'): # hi there
+      in_more
+
+      same_level 
+      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
+      1
+
+STMT: in_more
+
+STMT: same_level 
+STMT: if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
+STMT: 1
+
+STMT: back_down
+
+STMT: last_statement
+
+STMT: hello = 1.1(20);
+
+# subscription
+STMT: a[1] = b[2];
+
+# simple slicing
+STMT: c[1:1] = d[2:2];
+
+# simple slicing
+STMT: e[1:1, 2:2] = f[3:3, 4:4];
+TARGET SUBSCRIPTION: [1]
+TARGET SIMPLE SLICING: [1:1]
+TARGET EXTENDED SLICING: [1:1, 2:2]
+PRIMARY SUBSCRIPTION: [2]
+PRIMARY SIMPLE SLICING: [2:2]
+PRIMARY EXTENDED SLICING: [3:3, 4:4]
+*** SUCCESS ***
diff --git a/test/generate1.in b/test/generate1.in
new file mode 100644
index 00000000..0e5b920a
--- /dev/null
+++ b/test/generate1.in
@@ -0,0 +1,48 @@
+
+# dude, this is a comment
+ # some more
+hello
+def dude():
+    yes
+    awesome;
+
+    # Here we have a comment
+    def realy_awesome(): # hi there
+      in_more
+
+      same_level 
+      def one_liner(): first; second # both inside one_liner
+
+    back_down
+
+last_statement
+
+# dude, this is a comment
+ # some more
+hello
+if 1:
+    yes
+    awesome;
+
+    # Here we have a comment
+    if ('hello'): # hi there
+      in_more
+
+      same_level 
+      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
+      1
+
+    back_down
+
+last_statement
+
+hello = 1.1(20);
+
+# subscription
+a[1] = b[2];
+
+# simple slicing
+c[1:1] = d[2:2];
+
+# simple slicing
+e[1:1, 2:2] = f[3:3, 4:4];
diff --git a/test/python/python.lm b/test/generate1.lm
index 4cc02f47..e5e13f93 100644
--- a/test/python/python.lm
+++ b/test/generate1.lm
@@ -725,8 +725,9 @@ int print_stmts( S: start )
 }
 
 S: start = parse start( stdin )
-print_xml( S )
+print( '*** SUCCESS ***\n' )
 print( S '\n' )
+print( '***\n' )
 print_stmts( S )
 print_target_subscriptions_and_slicings( S )
 print_primary_subscriptions_and_slicings( S )
diff --git a/test/lookup1.exp b/test/lookup1.exp
new file mode 100644
index 00000000..8fc58d76
--- /dev/null
+++ b/test/lookup1.exp
@@ -0,0 +1,58 @@
+***** NAMSPACES *****
+<root_namespace> {
+  A {
+    B
+  }
+  B {
+    Find
+  }
+  C {
+    D
+    I
+    f
+    g
+    i
+    j
+    find
+  }
+  C
+  C
+  C
+  D
+  E
+  E
+  T
+  Y {
+    Z
+    f
+    t
+  }
+  a
+  b
+  b
+  c
+  c
+  d
+  e
+  f
+  f
+  f
+  i
+  i
+  Int
+  ns1 {
+    sub1 {
+      A
+    }
+    sub2 {
+      B
+    }
+  }
+  ns2 {
+    C
+    i
+  }
+  function
+}
+***** UNKNOWN DECLARATORS *****
+C
diff --git a/test/lookup1.in b/test/lookup1.in
new file mode 100644
index 00000000..83d51071
--- /dev/null
+++ b/test/lookup1.in
@@ -0,0 +1,153 @@
+namespace ns1
+{
+	namespace sub1 { class A {}; }
+	namespace sub2 { class B {}; }
+}
+
+namespace ns2
+{
+	int i = b;
+	class C
+	{
+	};
+
+	using namespace ns1;
+}
+
+ns2::sub1::A a;
+
+struct A
+{
+	struct B {};
+};
+
+struct C
+{
+	struct D : virtual public A {};
+};
+
+C::D::A d;
+
+C c;
+
+struct C
+{
+
+};
+
+enum E
+{
+	C,
+	b
+};
+
+E e;
+
+enum E
+{
+	C,
+	b
+};
+
+
+int i;
+class C
+{
+	int j;
+};
+
+class D
+{
+	int ~D();
+};
+
+int C::k;
+int C::~C;
+
+typedef int Int;
+
+class C {};
+void ~C( );
+void C::operator +( int i );
+
+int i;
+
+//void operator C( void k );
+
+class C
+{
+	
+};
+
+int C::f( int i, int j( void v ) );
+class C 
+{
+	class D {};
+
+	typedef C I;
+
+	I::D i;
+};
+
+C c;
+
+void function( int i, int j )
+{
+	function();
+}
+
+
+
+class B { class Find {}; };
+
+typedef B T;
+
+class C : public T
+{
+	Find find;
+};
+
+
+template <class X> struct Y
+{
+	X t;
+	void f();
+};
+
+template <class X> void Y<X>::f();
+template <class X> struct Y
+{
+	class Z {};
+};
+
+class Y<int>
+{
+	int i;
+};
+
+//void f( class C<int> i, int j );
+
+int f( int (*) [](), void );
+void f();
+class C
+{
+	class D {};
+	void g();
+};
+
+//typename C c;
+
+class C
+{
+	class D {};
+	int f();
+};
+
+int f()
+{
+}
+
+int C::f()
+{
+	D d;
+}
diff --git a/test/cxx/cxx.lm b/test/lookup1.lm
index e3f4aef9..935427f3 100644
--- a/test/cxx/cxx.lm
+++ b/test/lookup1.lm
@@ -2147,8 +2147,11 @@ int printNamespace()
 }
 
 S: start = parse start( stdin )
-print( '***** SUCCESS *****\n' )
-print_xml( S )
+if ! S {
+	print( error() )
+	exit( 1 )
+}
+
 print( '***** NAMSPACES *****\n' )
 printNamespace()
 print( '***** UNKNOWN DECLARATORS *****\n' )
diff --git a/test/multiregion2.lm b/test/multiregion2.lm
index f86d931c..7cba9df3 100644
--- a/test/multiregion2.lm
+++ b/test/multiregion2.lm
@@ -69,7 +69,6 @@ def header
 def request
 	[request_line header* CRLF]
 
-
 parse R: request*( stdin )
 
 if !R {
@@ -77,8 +76,7 @@ if !R {
 	exit( 1 )
 }
 
-for FV: fv in R 
-{
+for FV: fv in R {
 	if match FV [fv_ext]
 		FV = cons fv " "
 }
diff --git a/test/python/Makefile.am b/test/python/Makefile.am
deleted file mode 100644
index 039b0f4b..00000000
--- a/test/python/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-TEST_CASES = \
-	python.lm
-
-INPUT = \
-	python1.py.in \
-	python2.py.in \
-	python3.py.in \
-	python4.py.in
-
-EXPECTED_OUTPUT = \
-	python1.py.exp \
-	python2.py.exp \
-	python3.py.exp \
-	python4.py.exp
-
-EXTRA_DIST = TESTS runtests.mk $(TEST_CASES) $(INPUT) $(EXPECTED_OUTPUT)
diff --git a/test/python/TESTS b/test/python/TESTS
deleted file mode 100644
index 7a044c74..00000000
--- a/test/python/TESTS
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-
-TESTS="
-	python.lm
-"
diff --git a/test/python/python1.py.exp b/test/python/python1.py.exp
deleted file mode 100644
index 604a4f7e..00000000
--- a/test/python/python1.py.exp
+++ /dev/null
@@ -1,49 +0,0 @@
-<start><file_input><_repeat_file_input_forms><file_input_forms><NEWLINE></NEWLINE></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>hello</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms><file_input_forms><statement><compound_stmt><funcdef><decorators></decorators><_literal_001c>def</_literal_001c><funcname><identifier>dude</identifier></funcname><_literal_003a>(</_literal_003a><opt_parameter_list></opt_parameter_list><_literal_003b>)</_literal_003b><_literal_0042>:</_literal_0042><suite><NEWLINE></NEWLINE><INDENT></INDENT><statement_seq><statement_seq><statement_seq><statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>yes</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>awesome</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><compound_stmt><funcdef><decorators></decorators><_literal_001c>def</_literal_001c><funcname><identifier>realy_awesome</identifier></funcname><_literal_003a>(</_literal_003a><opt_parameter_list></opt_parameter_list><_literal_003b>)</_literal_003b><_literal_0042>:</_literal_0042><suite><NEWLINE></NEWLINE><INDENT></INDENT><statement_seq><statement_seq><statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>in_more</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>same_level</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><compound_stmt><funcdef><decorators></decorators><_literal_001c>def</_literal_001c><funcname><identifier>one_liner</identifier></funcname><_literal_003a>(</_literal_003a><opt_parameter_list></opt_parameter_list><_literal_003b>)</_literal_003b><_literal_0042>:</_literal_0042><suite><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>first</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt><another_stmt><_literal_0046>;</_literal_0046><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>second</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt></another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></suite></funcdef></compound_stmt></statement></statement_seq><DEDENT></DEDENT></suite></funcdef></compound_stmt></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>back_down</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><DEDENT></DEDENT></suite></funcdef></compound_stmt></statement></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>last_statement</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms></_repeat_file_input_forms></file_input></start>
-hello
-def dude():
-    yes
-    awesome;
-
-    # Here we have a comment
-    def realy_awesome(): # hi there
-      in_more
-
-      same_level 
-      def one_liner(): first; second # both inside one_liner
-
-    back_down
-
-last_statement
-STMT: hello
-STMT: def dude():
-    yes
-    awesome;
-
-    # Here we have a comment
-    def realy_awesome(): # hi there
-      in_more
-
-      same_level 
-      def one_liner(): first; second # both inside one_liner
-
-    back_down
-
-STMT: yes
-STMT: awesome;
-
-    # Here we have a comment
-STMT: def realy_awesome(): # hi there
-      in_more
-
-      same_level 
-      def one_liner(): first; second # both inside one_liner
-
-STMT: in_more
-
-STMT: same_level 
-STMT: def one_liner(): first; second # both inside one_liner
-
-STMT: back_down
-
-STMT: last_statement
-*** SUCCESS ***
diff --git a/test/python/python1.py.in b/test/python/python1.py.in
deleted file mode 100644
index 22ffd2e1..00000000
--- a/test/python/python1.py.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# dude, this is a comment
- # some more
-hello
-def dude():
-    yes
-    awesome;
-
-    # Here we have a comment
-    def realy_awesome(): # hi there
-      in_more
-
-      same_level 
-      def one_liner(): first; second # both inside one_liner
-
-    back_down
-
-last_statement
diff --git a/test/python/python2.py.exp b/test/python/python2.py.exp
deleted file mode 100644
index d01dfa4d..00000000
--- a/test/python/python2.py.exp
+++ /dev/null
@@ -1,55 +0,0 @@
-<start><file_input><_repeat_file_input_forms><file_input_forms><NEWLINE></NEWLINE></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>hello</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms><file_input_forms><statement><compound_stmt><if_stmt><_literal_000d>if</_literal_000d><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression><_literal_0042>:</_literal_0042><suite><NEWLINE></NEWLINE><INDENT></INDENT><statement_seq><statement_seq><statement_seq><statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>yes</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>awesome</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><compound_stmt><if_stmt><_literal_000d>if</_literal_000d><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><enclosure><parenth_form><_literal_003a>(</_literal_003a><opt_expression_list><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><stringliteral>'hello'</stringliteral></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></opt_expression_list><_literal_003b>)</_literal_003b></parenth_form></enclosure></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression><_literal_0042>:</_literal_0042><suite><NEWLINE></NEWLINE><INDENT></INDENT><statement_seq><statement_seq><statement_seq><statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>in_more</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>same_level</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><statement><compound_stmt><if_stmt><_literal_000d>if</_literal_000d><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><enclosure><list_display><_literal_003c>[</_literal_003c><opt_listmaker><listmaker><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><stringliteral>'dude'</stringliteral></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression><_repeat_listmaker_ext><listmaker_ext><_literal_0041>,</_literal_0041><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><stringliteral>'dudess'</stringliteral></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></listmaker_ext></_repeat_listmaker_ext><opt_comma></opt_comma></listmaker></opt_listmaker><_literal_003d>]</_literal_003d></list_display></enclosure></atom><primary_ext_rep><primary_ext><attributeref><_literal_0043>.</_literal_0043><identifier>horsie</identifier></attributeref></primary_ext><primary_ext_rep><primary_ext><call><_literal_003a>(</_literal_003a><opt_argument_list></opt_argument_list><_literal_003b>)</_literal_003b></call></primary_ext><primary_ext_rep></primary_ext_rep></primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression><_literal_0042>:</_literal_0042><suite><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>first</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt><another_stmt><_literal_0046>;</_literal_0046><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>second</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt></another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></suite><_repeat_elif_part></_repeat_elif_part><opt_else_part></opt_else_part></if_stmt></compound_stmt></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><DEDENT></DEDENT></suite><_repeat_elif_part></_repeat_elif_part><opt_else_part></opt_else_part></if_stmt></compound_stmt></statement></statement_seq><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>back_down</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></statement_seq><DEDENT></DEDENT></suite><_repeat_elif_part></_repeat_elif_part><opt_else_part></opt_else_part></if_stmt></compound_stmt></statement></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><expression_stmt><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>last_statement</identifier></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></expression_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms></_repeat_file_input_forms></file_input></start>
-hello
-if 1:
-    yes
-    awesome;
-
-    # Here we have a comment
-    if ('hello'): # hi there
-      in_more
-
-      same_level 
-      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
-      1
-
-    back_down
-
-last_statement
-
-STMT: hello
-STMT: if 1:
-    yes
-    awesome;
-
-    # Here we have a comment
-    if ('hello'): # hi there
-      in_more
-
-      same_level 
-      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
-      1
-
-    back_down
-
-STMT: yes
-STMT: awesome;
-
-    # Here we have a comment
-STMT: if ('hello'): # hi there
-      in_more
-
-      same_level 
-      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
-      1
-
-STMT: in_more
-
-STMT: same_level 
-STMT: if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
-STMT: 1
-
-STMT: back_down
-
-STMT: last_statement
-
-*** SUCCESS ***
diff --git a/test/python/python2.py.in b/test/python/python2.py.in
deleted file mode 100644
index 063825e1..00000000
--- a/test/python/python2.py.in
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# dude, this is a comment
- # some more
-hello
-if 1:
-    yes
-    awesome;
-
-    # Here we have a comment
-    if ('hello'): # hi there
-      in_more
-
-      same_level 
-      if ['dude', 'dudess'].horsie(): first; second # both inside one_liner
-      1
-
-    back_down
-
-last_statement
-
diff --git a/test/python/python3.py.exp b/test/python/python3.py.exp
deleted file mode 100644
index e6e0d2f8..00000000
--- a/test/python/python3.py.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-<start><file_input><_repeat_file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><assignment_stmt><target_equals_list><target_equals><target_list><target_list_core><target><target_atom><identifier>hello</identifier></target_atom><target_ext_rep></target_ext_rep></target></target_list_core><opt_comma></opt_comma></target_list><_literal_0045>=</_literal_0045></target_equals></target_equals_list><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><floatnumber>1.1</floatnumber></pyliteral></atom><primary_ext_rep><primary_ext><call><_literal_003a>(</_literal_003a><opt_argument_list><argument_list><positional_arguments><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>20</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></positional_arguments><opt_comma_keyword_arguments></opt_comma_keyword_arguments><opt_comma_star_expr></opt_comma_star_expr><opt_comma_dstar_expr></opt_comma_dstar_expr></argument_list><opt_comma></opt_comma></opt_argument_list><_literal_003b>)</_literal_003b></call></primary_ext><primary_ext_rep></primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></assignment_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms></_repeat_file_input_forms></file_input></start>hello = 1.1(20);
-STMT: hello = 1.1(20);
-*** SUCCESS ***
diff --git a/test/python/python3.py.in b/test/python/python3.py.in
deleted file mode 100644
index 90ecf3f9..00000000
--- a/test/python/python3.py.in
+++ /dev/null
@@ -1 +0,0 @@
-hello = 1.1(20);
diff --git a/test/python/python4.py.exp b/test/python/python4.py.exp
deleted file mode 100644
index 8a47461e..00000000
--- a/test/python/python4.py.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-<start><file_input><_repeat_file_input_forms><file_input_forms><NEWLINE></NEWLINE></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><assignment_stmt><target_equals_list><target_equals><target_list><target_list_core><target><target_atom><identifier>a</identifier></target_atom><target_ext_rep><target_ext><subscription><_literal_003c>[</_literal_003c><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list><_literal_003d>]</_literal_003d></subscription></target_ext><target_ext_rep></target_ext_rep></target_ext_rep></target></target_list_core><opt_comma></opt_comma></target_list><_literal_0045>=</_literal_0045></target_equals></target_equals_list><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>b</identifier></atom><primary_ext_rep><primary_ext><subscription><_literal_003c>[</_literal_003c><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>2</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list><_literal_003d>]</_literal_003d></subscription></primary_ext><primary_ext_rep></primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></assignment_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><assignment_stmt><target_equals_list><target_equals><target_list><target_list_core><target><target_atom><identifier>c</identifier></target_atom><target_ext_rep><target_ext><slicing><simple_slicing><_literal_003c>[</_literal_003c><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice><_literal_003d>]</_literal_003d></simple_slicing></slicing></target_ext><target_ext_rep></target_ext_rep></target_ext_rep></target></target_list_core><opt_comma></opt_comma></target_list><_literal_0045>=</_literal_0045></target_equals></target_equals_list><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>d</identifier></atom><primary_ext_rep><primary_ext><slicing><simple_slicing><_literal_003c>[</_literal_003c><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>2</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>2</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice><_literal_003d>]</_literal_003d></simple_slicing></slicing></primary_ext><primary_ext_rep></primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></assignment_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms><file_input_forms><statement><stmt_list><simple_stmt><assignment_stmt><target_equals_list><target_equals><target_list><target_list_core><target><target_atom><identifier>e</identifier></target_atom><target_ext_rep><target_ext><slicing><extended_slicing><_literal_003c>[</_literal_003c><slice_list><slice_item><proper_slice><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>1</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice></proper_slice></slice_item><_repeat_slice_list_ext><slice_list_ext><_literal_0041>,</_literal_0041><slice_item><proper_slice><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>2</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>2</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice></proper_slice></slice_item></slice_list_ext></_repeat_slice_list_ext><opt_comma></opt_comma></slice_list><_literal_003d>]</_literal_003d></extended_slicing></slicing></target_ext><target_ext_rep></target_ext_rep></target_ext_rep></target></target_list_core><opt_comma></opt_comma></target_list><_literal_0045>=</_literal_0045></target_equals></target_equals_list><expression_list><expression_list_core><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><identifier>f</identifier></atom><primary_ext_rep><primary_ext><slicing><extended_slicing><_literal_003c>[</_literal_003c><slice_list><slice_item><proper_slice><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>3</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>3</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice></proper_slice></slice_item><_repeat_slice_list_ext><slice_list_ext><_literal_0041>,</_literal_0041><slice_item><proper_slice><short_slice><lower_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>4</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></lower_bound><_literal_0042>:</_literal_0042><upper_bound><expression><or_test><and_test><not_test><comparison><or_expr><xor_expr><and_expr><shift_expr><a_expr><m_expr><u_expr><power><primary><atom><pyliteral><integer>4</integer></pyliteral></atom><primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></upper_bound></short_slice></proper_slice></slice_item></slice_list_ext></_repeat_slice_list_ext><opt_comma></opt_comma></slice_list><_literal_003d>]</_literal_003d></extended_slicing></slicing></primary_ext><primary_ext_rep></primary_ext_rep></primary_ext_rep></primary></power></u_expr></m_expr></a_expr></shift_expr></and_expr></xor_expr></or_expr><_repeat_comparison_part></_repeat_comparison_part></comparison></not_test></and_test></or_test></expression></expression_list_core><opt_comma></opt_comma></expression_list></assignment_stmt></simple_stmt><_repeat_another_stmt></_repeat_another_stmt><opt_semi><_literal_0046>;</_literal_0046></opt_semi></stmt_list><NEWLINE></NEWLINE></statement></file_input_forms></_repeat_file_input_forms></file_input></start>
-a[1] = b[2];
-
-# simple slicing
-c[1:1] = d[2:2];
-
-# simple slicing
-e[1:1, 2:2] = f[3:3, 4:4];
-STMT: a[1] = b[2];
-
-# simple slicing
-STMT: c[1:1] = d[2:2];
-
-# simple slicing
-STMT: e[1:1, 2:2] = f[3:3, 4:4];
-TARGET SUBSCRIPTION: [1]
-TARGET SIMPLE SLICING: [1:1]
-TARGET EXTENDED SLICING: [1:1, 2:2]
-PRIMARY SUBSCRIPTION: [2]
-PRIMARY SIMPLE SLICING: [2:2]
-PRIMARY EXTENDED SLICING: [3:3, 4:4]
-*** SUCCESS ***
diff --git a/test/python/python4.py.in b/test/python/python4.py.in
deleted file mode 100644
index fd9ce649..00000000
--- a/test/python/python4.py.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# subscription
-a[1] = b[2];
-
-# simple slicing
-c[1:1] = d[2:2];
-
-# simple slicing
-e[1:1, 2:2] = f[3:3, 4:4];
diff --git a/test/python/runtests.mk b/test/python/runtests.mk
deleted file mode 100644
index 158d14fb..00000000
--- a/test/python/runtests.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-SUBDIRS = 
-
-TESTS = \
-	python.lm
-
-DIFFS = \
-	python1.py.diff \
-	python2.py.diff \
-	python3.py.diff \
-	python4.py.diff
-
-all: Makefile $(DIFFS) $(SUBDIRS)
-
-.PHONY: clean $(SUBDIRS:%=%-clean)
-clean: $(SUBDIRS:%=%-clean)
-	rm -f *.bin
-$(SUBDIRS:%=%-clean):
-	cd $(@:%-clean=%) && $(MAKE) clean
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
-	cd $@ && $(MAKE)
-
-Makefile: ../genmf TESTS
-	../genmf > Makefile
-
-python1.py.diff: python1.py.out python1.py.exp
-	@diff -u python1.py.exp python1.py.out > python1.py.diff || ( cat python1.py.diff; rm python1.py.diff )
-
-python1.py.out: python.bin
-	./python.bin  < python1.py.in > python1.py.out
-
-python2.py.diff: python2.py.out python2.py.exp
-	@diff -u python2.py.exp python2.py.out > python2.py.diff || ( cat python2.py.diff; rm python2.py.diff )
-
-python2.py.out: python.bin
-	./python.bin  < python2.py.in > python2.py.out
-
-python3.py.diff: python3.py.out python3.py.exp
-	@diff -u python3.py.exp python3.py.out > python3.py.diff || ( cat python3.py.diff; rm python3.py.diff )
-
-python3.py.out: python.bin
-	./python.bin  < python3.py.in > python3.py.out
-
-python4.py.diff: python4.py.out python4.py.exp
-	@diff -u python4.py.exp python4.py.out > python4.py.diff || ( cat python4.py.diff; rm python4.py.diff )
-
-python4.py.out: python.bin
-	./python.bin  < python4.py.in > python4.py.out
-
-python.bin: python.lm ../../colm/colm
-	../../colm/colm python.lm
diff --git a/test/ruby/Makefile.am b/test/ruby/Makefile.am
deleted file mode 100644
index 9dc604a0..00000000
--- a/test/ruby/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-TEST_CASES = \
-	ruby.lm
-
-INPUT = \
-	ruby01.rb.in
-
-EXPECTED_OUTPUT = \
-	ruby01.rb.exp
-
-EXTRA_DIST = TESTS runtests.mk $(TEST_CASES) $(INPUT) $(EXPECTED_OUTPUT)
diff --git a/test/ruby/TESTS b/test/ruby/TESTS
deleted file mode 100644
index 6fc8854a..00000000
--- a/test/ruby/TESTS
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-
-TESTS="
-        ruby.lm
-"
-
diff --git a/test/ruby/runtests.mk b/test/ruby/runtests.mk
deleted file mode 100644
index 95e67466..00000000
--- a/test/ruby/runtests.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-SUBDIRS = 
-
-TESTS = \
-	ruby.lm
-
-DIFFS = \
-	ruby01.rb.diff
-
-all: Makefile $(DIFFS) $(SUBDIRS)
-
-.PHONY: clean $(SUBDIRS:%=%-clean)
-clean: $(SUBDIRS:%=%-clean)
-	rm -f *.bin
-$(SUBDIRS:%=%-clean):
-	cd $(@:%-clean=%) && $(MAKE) clean
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
-	cd $@ && $(MAKE)
-
-Makefile: ../genmf TESTS
-	../genmf > Makefile
-
-ruby01.rb.diff: ruby01.rb.out ruby01.rb.exp
-	@diff -u ruby01.rb.exp ruby01.rb.out > ruby01.rb.diff || ( cat ruby01.rb.diff; rm ruby01.rb.diff )
-
-ruby01.rb.out: ruby.bin
-	./ruby.bin  < ruby01.rb.in > ruby01.rb.out
-
-ruby.bin: ruby.lm ../../colm/colm
-	../../colm/colm ruby.lm
diff --git a/test/runtests.mk b/test/runtests.mk
index f7c4979d..f05530cd 100755
--- a/test/runtests.mk
+++ b/test/runtests.mk
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f 
 
-SUBDIRS =  python cxx ruby
+SUBDIRS = 
 
 TESTS = \
+	ambig1.lm \
 	backtrack1.lm \
 	backtrack2.lm \
 	backtrack3.lm \
@@ -22,6 +23,8 @@ TESTS = \
 	construct1.lm \
 	construct2.lm \
 	construct3.lm \
+	generate1.lm \
+	lookup1.lm \
 	treecmp1.lm \
 	context1.lm \
 	context2.lm \
@@ -67,6 +70,7 @@ TESTS = \
 	export1.lm
 
 DIFFS = \
+	ambig1.diff \
 	backtrack1.diff \
 	backtrack2.diff \
 	backtrack3.diff \
@@ -86,6 +90,8 @@ DIFFS = \
 	construct1.diff \
 	construct2.diff \
 	construct3.diff \
+	generate1.diff \
+	lookup1.diff \
 	treecmp1.diff \
 	context1.diff \
 	context2.diff \
@@ -145,6 +151,14 @@ $(SUBDIRS):
 runtests.mk: ./genmf TESTS
 	./genmf > runtests.mk
 
+ambig1.diff: ambig1.out ambig1.exp
+	@diff -u ambig1.exp ambig1.out > ambig1.diff || ( cat ambig1.diff; rm ambig1.diff )
+
+ambig1.out: ambig1.bin
+	./ambig1.bin  < ambig1.in > ambig1.out
+
+ambig1.bin: ambig1.lm ./../colm/colm
+	./../colm/colm ambig1.lm
 backtrack1.diff: backtrack1.out backtrack1.exp
 	@diff -u backtrack1.exp backtrack1.out > backtrack1.diff || ( cat backtrack1.diff; rm backtrack1.diff )
 
@@ -297,6 +311,22 @@ construct3.out: construct3.bin
 
 construct3.bin: construct3.lm ./../colm/colm
 	./../colm/colm construct3.lm
+generate1.diff: generate1.out generate1.exp
+	@diff -u generate1.exp generate1.out > generate1.diff || ( cat generate1.diff; rm generate1.diff )
+
+generate1.out: generate1.bin
+	./generate1.bin  < generate1.in > generate1.out
+
+generate1.bin: generate1.lm ./../colm/colm
+	./../colm/colm generate1.lm
+lookup1.diff: lookup1.out lookup1.exp
+	@diff -u lookup1.exp lookup1.out > lookup1.diff || ( cat lookup1.diff; rm lookup1.diff )
+
+lookup1.out: lookup1.bin
+	./lookup1.bin  < lookup1.in > lookup1.out
+
+lookup1.bin: lookup1.lm ./../colm/colm
+	./../colm/colm lookup1.lm
 treecmp1.diff: treecmp1.out treecmp1.exp
 	@diff -u treecmp1.exp treecmp1.out > treecmp1.diff || ( cat treecmp1.diff; rm treecmp1.diff )