diff --git a/alib2/test-src/alphabet/SymbolTest.cpp b/alib2/test-src/alphabet/SymbolTest.cpp
index d9d8a40cb2bcd173de108bfe7e592c995828957a..458c1499f2e448dab8b85479e72dfafa8b591b53 100644
--- a/alib2/test-src/alphabet/SymbolTest.cpp
+++ b/alib2/test-src/alphabet/SymbolTest.cpp
@@ -39,18 +39,38 @@ void SymbolTest::testCopyConstruct() {
 }
 
 void SymbolTest::testEqual() {
-  std::string input = "a";
-  
-  alphabet::SymbolFromStringParser parser(input);
-  alphabet::Symbol symbol = parser.parse();
+  {
+    std::string input = "a";
 
-  alphabet::SymbolToStringComposer composer;
-  std::string output = composer.compose(symbol);
+    alphabet::SymbolFromStringParser parser(input);
+    alphabet::Symbol symbol = parser.parse();
 
-  alphabet::SymbolFromStringParser parser2(output);
-  alphabet::Symbol symbol2 = parser2.parse();
+    alphabet::SymbolToStringComposer composer;
+    std::string output = composer.compose(symbol);
 
-  CPPUNIT_ASSERT( symbol == symbol2 );
+    CPPUNIT_ASSERT( input == output );
+
+    alphabet::SymbolFromStringParser parser2(output);
+    alphabet::Symbol symbol2 = parser2.parse();
+
+    CPPUNIT_ASSERT( symbol == symbol2 );
+  }
+  {
+    std::string input = "'aaaa'";
+
+    alphabet::SymbolFromStringParser parser(input);
+    alphabet::Symbol symbol = parser.parse();
+
+    alphabet::SymbolToStringComposer composer;
+    std::string output = composer.compose(symbol);
+
+    CPPUNIT_ASSERT( input == output );
+
+    alphabet::SymbolFromStringParser parser2(output);
+    alphabet::Symbol symbol2 = parser2.parse();
+
+    CPPUNIT_ASSERT( symbol == symbol2 );
+  }
 }
 
 void SymbolTest::testXMLParser() {
diff --git a/alib2/test-src/label/LabelTest.cpp b/alib2/test-src/label/LabelTest.cpp
index 1123b3490b52af1023fdab795dddd98043beb70c..cff493a5ff660206001f423d4bb563d21912324b 100644
--- a/alib2/test-src/label/LabelTest.cpp
+++ b/alib2/test-src/label/LabelTest.cpp
@@ -37,18 +37,38 @@ void LabelTest::testCopyConstruct() {
 }
 
 void LabelTest::testEqual() {
-  std::string input = "1";
-  
-  label::LabelFromStringParser parser(input);
-  label::Label label = parser.parse();
+  {
+    std::string input = "1";
 
-  label::LabelToStringComposer composer;
-  std::string output = composer.compose(label);
-  
-  label::LabelFromStringParser parser2(output);
-  label::Label label2 = parser2.parse();
-  
-  CPPUNIT_ASSERT( label == label2 );
+    label::LabelFromStringParser parser(input);
+    label::Label label = parser.parse();
+
+    label::LabelToStringComposer composer;
+    std::string output = composer.compose(label);
+
+    CPPUNIT_ASSERT( input == output );
+
+    label::LabelFromStringParser parser2(output);
+    label::Label label2 = parser2.parse();
+
+    CPPUNIT_ASSERT( label == label2 );
+  }
+  {
+    std::string input = "'aaaa'";
+
+    label::LabelFromStringParser parser(input);
+    label::Label label = parser.parse();
+
+    label::LabelToStringComposer composer;
+    std::string output = composer.compose(label);
+
+    CPPUNIT_ASSERT( input == output );
+
+    label::LabelFromStringParser parser2(output);
+    label::Label label2 = parser2.parse();
+
+    CPPUNIT_ASSERT( label == label2 );
+  }
 }
 
 void LabelTest::testXMLParser() {
@@ -80,272 +100,6 @@ void LabelTest::testOrder() {
   label::StringLabel s1("1");
   label::IntegerLabel i1(1);
   
-  bool tmp = s1 < i1;
-  bool tmp2 = i1 < s1;
-
   CPPUNIT_EXCLUSIVE_OR( s1 < i1, i1 < s1);
 }
 
-void LabelTest::testOrder2() {
-/*  string::StringLabel s1(label::Label(label::LabeledLabel(label::Label(label::StringLabel("1")))));
-  string::StringLabel s2(label::Label(label::LabeledLabel(label::Label(label::StringLabel("2")))));
-  string::StringLabel s3(label::Label(label::LabeledLabel(label::Label(label::StringLabel("3")))));
-  
-  string::StringEmpty e1;
-  string::StringEpsilon e2;
-  
-  string::Iteration i1(s1);
-  string::Iteration i2(s2);
-  string::Iteration i3(s3);
-
-  string::String alt1(string::Alternation(s1, s1));
-  string::String alt2(string::Alternation(s1, s2));
-  string::String alt3(string::Alternation(s1, s3));
-  string::String alt4(string::Alternation(s2, s1));
-  string::String alt5(string::Alternation(s2, s2));
-  string::String alt6(string::Alternation(s2, s3));
-  string::String alt7(string::Alternation(s3, s1));
-  string::String alt8(string::Alternation(s3, s2));
-  string::String alt9(string::Alternation(s3, s3));
-  
-  string::String con1(string::Concatenation (s1, s1));
-  string::String con2(string::Concatenation (s1, s2));
-  string::String con3(string::Concatenation (s1, s3));
-  string::String con4(string::Concatenation (s2, s1));
-  string::String con5(string::Concatenation (s2, s2));
-  string::String con6(string::Concatenation (s2, s3));
-  string::String con7(string::Concatenation (s3, s1));
-  string::String con8(string::Concatenation (s3, s2));
-  string::String con9(string::Concatenation (s3, s3));
-  
-  string::String ite1(i1);
-  string::String ite2(i2);
-  string::String ite3(i3);
-  
-  string::String emp1(e1);
-  string::String eps1(e2);
-  
-  string::String sym1(s1);
-  string::String sym2(s2);
-  string::String sym3(s3);
-  
-
-  
-  CPPUNIT_ASSERT(alt1 == alt1);
-  CPPUNIT_ASSERT(alt1 < alt2);
-  CPPUNIT_ASSERT(alt1 < alt3);
-  CPPUNIT_ASSERT(alt1 < alt4);
-  CPPUNIT_ASSERT(alt1 < alt5);
-  CPPUNIT_ASSERT(alt1 < alt6);
-  CPPUNIT_ASSERT(alt1 < alt7);
-  CPPUNIT_ASSERT(alt1 < alt8);
-  CPPUNIT_ASSERT(alt1 < alt9);
-  
-  CPPUNIT_ASSERT(alt2 > alt1);
-  CPPUNIT_ASSERT(alt2 == alt2);
-  CPPUNIT_ASSERT(alt2 < alt3);
-  CPPUNIT_ASSERT(alt2 < alt4);
-  CPPUNIT_ASSERT(alt2 < alt5);
-  CPPUNIT_ASSERT(alt2 < alt6);
-  CPPUNIT_ASSERT(alt2 < alt7);
-  CPPUNIT_ASSERT(alt2 < alt8);
-  CPPUNIT_ASSERT(alt2 < alt9);
-  
-  CPPUNIT_ASSERT(alt3 > alt1);
-  CPPUNIT_ASSERT(alt3 > alt2);
-  CPPUNIT_ASSERT(alt3 == alt3);
-  CPPUNIT_ASSERT(alt3 < alt4);
-  CPPUNIT_ASSERT(alt3 < alt5);
-  CPPUNIT_ASSERT(alt3 < alt6);
-  CPPUNIT_ASSERT(alt3 < alt7);
-  CPPUNIT_ASSERT(alt3 < alt8);
-  CPPUNIT_ASSERT(alt3 < alt9);
-  
-  CPPUNIT_ASSERT(alt4 > alt1);
-  CPPUNIT_ASSERT(alt4 > alt2);
-  CPPUNIT_ASSERT(alt4 > alt3);
-  CPPUNIT_ASSERT(alt4 == alt4);
-  CPPUNIT_ASSERT(alt4 < alt5);
-  CPPUNIT_ASSERT(alt4 < alt6);
-  CPPUNIT_ASSERT(alt4 < alt7);
-  CPPUNIT_ASSERT(alt4 < alt8);
-  CPPUNIT_ASSERT(alt4 < alt9);
-  
-  CPPUNIT_ASSERT(alt5 > alt1);
-  CPPUNIT_ASSERT(alt5 > alt2);
-  CPPUNIT_ASSERT(alt5 > alt3);
-  CPPUNIT_ASSERT(alt5 > alt4);
-  CPPUNIT_ASSERT(alt5 == alt5);
-  CPPUNIT_ASSERT(alt5 < alt6);
-  CPPUNIT_ASSERT(alt5 < alt7);
-  CPPUNIT_ASSERT(alt5 < alt8);
-  CPPUNIT_ASSERT(alt5 < alt9);
-  
-  CPPUNIT_ASSERT(alt6 > alt1);
-  CPPUNIT_ASSERT(alt6 > alt2);
-  CPPUNIT_ASSERT(alt6 > alt3);
-  CPPUNIT_ASSERT(alt6 > alt4);
-  CPPUNIT_ASSERT(alt6 > alt5);
-  CPPUNIT_ASSERT(alt6 == alt6);
-  CPPUNIT_ASSERT(alt6 < alt7);
-  CPPUNIT_ASSERT(alt6 < alt8);
-  CPPUNIT_ASSERT(alt6 < alt9);
-  
-  CPPUNIT_ASSERT(alt7 > alt1);
-  CPPUNIT_ASSERT(alt7 > alt2);
-  CPPUNIT_ASSERT(alt7 > alt3);
-  CPPUNIT_ASSERT(alt7 > alt4);
-  CPPUNIT_ASSERT(alt7 > alt5);
-  CPPUNIT_ASSERT(alt7 > alt6);
-  CPPUNIT_ASSERT(alt7 == alt7);
-  CPPUNIT_ASSERT(alt7 < alt8);
-  CPPUNIT_ASSERT(alt7 < alt9);
-  
-  CPPUNIT_ASSERT(alt8 > alt1);
-  CPPUNIT_ASSERT(alt8 > alt2);
-  CPPUNIT_ASSERT(alt8 > alt3);
-  CPPUNIT_ASSERT(alt8 > alt4);
-  CPPUNIT_ASSERT(alt8 > alt5);
-  CPPUNIT_ASSERT(alt8 > alt6);
-  CPPUNIT_ASSERT(alt8 > alt7);
-  CPPUNIT_ASSERT(alt8 == alt8);
-  CPPUNIT_ASSERT(alt8 < alt9);
-  
-  CPPUNIT_ASSERT(alt9 > alt1);
-  CPPUNIT_ASSERT(alt9 > alt2);
-  CPPUNIT_ASSERT(alt9 > alt3);
-  CPPUNIT_ASSERT(alt9 > alt4);
-  CPPUNIT_ASSERT(alt9 > alt5);
-  CPPUNIT_ASSERT(alt9 > alt6);
-  CPPUNIT_ASSERT(alt9 > alt7);
-  CPPUNIT_ASSERT(alt9 > alt8);
-  CPPUNIT_ASSERT(alt9 == alt9);
-  
-  
-  
-  CPPUNIT_ASSERT(con1 == con1);
-  CPPUNIT_ASSERT(con1 < con2);
-  CPPUNIT_ASSERT(con1 < con3);
-  CPPUNIT_ASSERT(con1 < con4);
-  CPPUNIT_ASSERT(con1 < con5);
-  CPPUNIT_ASSERT(con1 < con6);
-  CPPUNIT_ASSERT(con1 < con7);
-  CPPUNIT_ASSERT(con1 < con8);
-  CPPUNIT_ASSERT(con1 < con9);
-  
-  CPPUNIT_ASSERT(con2 > con1);
-  CPPUNIT_ASSERT(con2 == con2);
-  CPPUNIT_ASSERT(con2 < con3);
-  CPPUNIT_ASSERT(con2 < con4);
-  CPPUNIT_ASSERT(con2 < con5);
-  CPPUNIT_ASSERT(con2 < con6);
-  CPPUNIT_ASSERT(con2 < con7);
-  CPPUNIT_ASSERT(con2 < con8);
-  CPPUNIT_ASSERT(con2 < con9);
-  
-  CPPUNIT_ASSERT(con3 > con1);
-  CPPUNIT_ASSERT(con3 > con2);
-  CPPUNIT_ASSERT(con3 == con3);
-  CPPUNIT_ASSERT(con3 < con4);
-  CPPUNIT_ASSERT(con3 < con5);
-  CPPUNIT_ASSERT(con3 < con6);
-  CPPUNIT_ASSERT(con3 < con7);
-  CPPUNIT_ASSERT(con3 < con8);
-  CPPUNIT_ASSERT(con3 < con9);
-  
-  CPPUNIT_ASSERT(con4 > con1);
-  CPPUNIT_ASSERT(con4 > con2);
-  CPPUNIT_ASSERT(con4 > con3);
-  CPPUNIT_ASSERT(con4 == con4);
-  CPPUNIT_ASSERT(con4 < con5);
-  CPPUNIT_ASSERT(con4 < con6);
-  CPPUNIT_ASSERT(con4 < con7);
-  CPPUNIT_ASSERT(con4 < con8);
-  CPPUNIT_ASSERT(con4 < con9);
-  
-  CPPUNIT_ASSERT(con5 > con1);
-  CPPUNIT_ASSERT(con5 > con2);
-  CPPUNIT_ASSERT(con5 > con3);
-  CPPUNIT_ASSERT(con5 > con4);
-  CPPUNIT_ASSERT(con5 == con5);
-  CPPUNIT_ASSERT(con5 < con6);
-  CPPUNIT_ASSERT(con5 < con7);
-  CPPUNIT_ASSERT(con5 < con8);
-  CPPUNIT_ASSERT(con5 < con9);
-  
-  CPPUNIT_ASSERT(con6 > con1);
-  CPPUNIT_ASSERT(con6 > con2);
-  CPPUNIT_ASSERT(con6 > con3);
-  CPPUNIT_ASSERT(con6 > con4);
-  CPPUNIT_ASSERT(con6 > con5);
-  CPPUNIT_ASSERT(con6 == con6);
-  CPPUNIT_ASSERT(con6 < con7);
-  CPPUNIT_ASSERT(con6 < con8);
-  CPPUNIT_ASSERT(con6 < con9);
-  
-  CPPUNIT_ASSERT(con7 > con1);
-  CPPUNIT_ASSERT(con7 > con2);
-  CPPUNIT_ASSERT(con7 > con3);
-  CPPUNIT_ASSERT(con7 > con4);
-  CPPUNIT_ASSERT(con7 > con5);
-  CPPUNIT_ASSERT(con7 > con6);
-  CPPUNIT_ASSERT(con7 == con7);
-  CPPUNIT_ASSERT(con7 < con8);
-  CPPUNIT_ASSERT(con7 < con9);
-  
-  CPPUNIT_ASSERT(con8 > con1);
-  CPPUNIT_ASSERT(con8 > con2);
-  CPPUNIT_ASSERT(con8 > con3);
-  CPPUNIT_ASSERT(con8 > con4);
-  CPPUNIT_ASSERT(con8 > con5);
-  CPPUNIT_ASSERT(con8 > con6);
-  CPPUNIT_ASSERT(con8 > con7);
-  CPPUNIT_ASSERT(con8 == con8);
-  CPPUNIT_ASSERT(con8 < con9);
-  
-  CPPUNIT_ASSERT(con9 > con1);
-  CPPUNIT_ASSERT(con9 > con2);
-  CPPUNIT_ASSERT(con9 > con3);
-  CPPUNIT_ASSERT(con9 > con4);
-  CPPUNIT_ASSERT(con9 > con5);
-  CPPUNIT_ASSERT(con9 > con6);
-  CPPUNIT_ASSERT(con9 > con7);
-  CPPUNIT_ASSERT(con9 > con8);
-  CPPUNIT_ASSERT(con9 == con9);
-  
-  
-  CPPUNIT_ASSERT(ite1 == ite1);
-  CPPUNIT_ASSERT(ite1 < ite2);
-  CPPUNIT_ASSERT(ite1 < ite3);
-  
-  CPPUNIT_ASSERT(ite2 > ite1);
-  CPPUNIT_ASSERT(ite2 == ite2);
-  CPPUNIT_ASSERT(ite2 < ite3);
-  
-  CPPUNIT_ASSERT(ite3 > ite1);
-  CPPUNIT_ASSERT(ite3 > ite2);
-  CPPUNIT_ASSERT(ite3 == ite3);
-  
-
-
-  CPPUNIT_ASSERT(emp1 == emp1);
-  
-  
-  
-  CPPUNIT_ASSERT(eps1 == eps1);
-
-
-
-  CPPUNIT_ASSERT(sym1 == sym1);
-  CPPUNIT_ASSERT(sym1 < sym2);
-  CPPUNIT_ASSERT(sym1 < sym3);
-  
-  CPPUNIT_ASSERT(sym2 > sym1);
-  CPPUNIT_ASSERT(sym2 == sym2);
-  CPPUNIT_ASSERT(sym2 < sym3);
-  
-  CPPUNIT_ASSERT(sym3 > sym1);
-  CPPUNIT_ASSERT(sym3 > sym2);
-  CPPUNIT_ASSERT(sym3 == sym3);*/
-}
-
diff --git a/alib2/test-src/label/LabelTest.h b/alib2/test-src/label/LabelTest.h
index db92e8c31052d3ec568ab2df55f78ac26664951c..feddc4470b7f2f8065d609cfac49e4ef6cc0bb76 100644
--- a/alib2/test-src/label/LabelTest.h
+++ b/alib2/test-src/label/LabelTest.h
@@ -9,7 +9,6 @@ class LabelTest : public CppUnit::TestFixture
   CPPUNIT_TEST( testEqual );
   CPPUNIT_TEST( testXMLParser );
   CPPUNIT_TEST( testOrder );
-  CPPUNIT_TEST( testOrder2 );
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -20,7 +19,6 @@ public:
   void testEqual();
   void testXMLParser();
   void testOrder();
-  void testOrder2();
 };
 
 #endif  // LABEL_TEST_H_
diff --git a/alib2/test-src/regexp/RegExpTest.cpp b/alib2/test-src/regexp/RegExpTest.cpp
index fbcf6ba13e1393c9e20b0b0ba3661439a5068a76..b1963615ff12d9cdc6596a617ae5394fc52b7d1e 100644
--- a/alib2/test-src/regexp/RegExpTest.cpp
+++ b/alib2/test-src/regexp/RegExpTest.cpp
@@ -57,6 +57,8 @@ void RegExpTest::testEqual() {
   regexp::RegExpToStringComposer composer;
   std::string output = composer.compose(regexp);
   
+//  CPPUNIT_ASSERT( input == output );
+  
   regexp::RegExpFromStringParser parser2(output);
   regexp::RegExp regexp2 = parser2.parse();
   
diff --git a/alib2/test-src/string/StringTest.cpp b/alib2/test-src/string/StringTest.cpp
index d7dbf259b40c3348a3f65400f1444611b25f5f3c..d34314ad6b8c4706a6fbc29829c7f30c5c453faa 100644
--- a/alib2/test-src/string/StringTest.cpp
+++ b/alib2/test-src/string/StringTest.cpp
@@ -56,6 +56,8 @@ void StringTest::testEqual() {
   string::StringToStringComposer composer;
   std::string output = composer.compose(string);
   
+  CPPUNIT_ASSERT( input == output );
+  
   string::StringFromStringParser parser2(output);
   string::String string2 = parser2.parse();