diff --git a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
index 490363f8853700e2d686c2944381e10d84722196..9a773011a80345d97d23eda5a95a844b1a238605 100644
--- a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
@@ -19,23 +19,23 @@ void RegExpDerivationTest::testRegExpDerivation() {
     // https://edux.fit.cvut.cz/oppa/BI-AAG/cviceni/aag-cv04.pdf
 
     // Exc. 13
-    this->ExecSingleTest("010 + 101 + 01*1 + 1*0", "0", "#E 1 0+#0 0 1+#E 0* 1+#0+#0 1* 0+#E");
-    this->ExecSingleTest("010 + 101 + 01*1 + 1*0", "0 0", "#0 1 0+#0 0+#0 0 1+(#0 0*+#E 0*) 1+#0+#0+#0 1* 0+#0");
+    this->ExecSingleTest("0 1 0 + 1 0 1 + 0*1 + 1*0", "0", "#E 1 0+#0 0 1+#E 0* 1+#0+#0 1* 0+#E");
+    this->ExecSingleTest("0 1 0 + 1 0 1 + 0*1 + 1*0", "0 0", "#0 1 0+#0 0+#0 0 1+(#0 0*+#E 0*) 1+#0+#0+#0 1* 0+#0");
 
     // Exc. 14
-    this->ExecSingleTest("(01*0 + 10*)*", "1", "(#0 1* 0+#E 0*) (0 1* 0+1 0*)*");
-    this->ExecSingleTest("(01*0 + 10*)*", "1 0", "(#0 1* 0+#0 0*+#E 0*) (0 1* 0+1 0*)*+(#E 1* 0+#0 0*) (0 1* 0+1 0*)*");
+    this->ExecSingleTest("(0 1*0 + 1 0*)*", "1", "(#0 1* 0+#E 0*) (0 1* 0+1 0*)*");
+    this->ExecSingleTest("(0 1*0 + 1 0*)*", "1 0", "(#0 1* 0+#0 0*+#E 0*) (0 1* 0+1 0*)*+(#E 1* 0+#0 0*) (0 1* 0+1 0*)*");
 
     // Exc. 15
-    this->ExecSingleTest("10*1*0", "100", "#0 0* 1* 0+(#0 0*+#E 0*) 1* 0+#0 1* 0+#E+#0 1* 0+#0");
+    this->ExecSingleTest("1 0*1*0", "1 0 0", "#0 0* 1* 0+(#0 0*+#E 0*) 1* 0+#0 1* 0+#E+#0 1* 0+#0");
 }
 
 void RegExpDerivationTest::ExecSingleTest(std::string regexp_str, std::string string_str, std::string result) {
     regexp::RegExp regexp = alib::StringDataFactory::fromString<regexp::RegExp>(regexp_str);
 
-    string::String string = alib::StringDataFactory::fromString<string::String>("\"" + string_str + "\"");
+    string::LinearString string = static_cast<const string::LinearString&>(alib::StringDataFactory::fromString<string::String>("\"" + string_str + "\"").getData());
 
-    regexp::RegExpDerivation d;
-    // TODO
-    // CPPUNIT_ASSERT(alib::StringDataFactory::toString<regexp::RegExp>(d.derivation(regexp, string)) == result);
+    std::cout << alib::StringDataFactory::toString<regexp::RegExp>(regexp::RegExpDerivation::derivation(regexp, string)) << " == " << std::endl << result << std::endl << std::endl;
+
+    CPPUNIT_ASSERT(alib::StringDataFactory::toString<regexp::RegExp>(regexp::RegExpDerivation::derivation(regexp, string)) == result);
 }
diff --git a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
index 01e07b2ca4af94d32895be4039832fcceecc5732..b708f3f82ef2af17ec90ef016951ad5cf99981c7 100644
--- a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
@@ -19,16 +19,15 @@ void RegExpIntegralTest::testRegExpIntegral() {
     // https://edux.fit.cvut.cz/oppa/BI-AAG/cviceni/aag-cv04.pdf
 
     // Exc. 16
-    this->ExecSingleTest("010 + 101", "1", "1 0 1 0 + 1 1 0 1");
+    this->ExecSingleTest("0 1 0 + 1 0 1", "1", "1 0 1 0+1 1 0 1");
 }
 
 void RegExpIntegralTest::ExecSingleTest(std::string regexp_str, std::string string_str, std::string result) {
     regexp::RegExp regexp = alib::StringDataFactory::fromString<regexp::RegExp>(regexp_str);
 
-    string::String string = alib::StringDataFactory::fromString<string::String>("\"" + string_str + "\"");
+    string::LinearString string = static_cast<const string::LinearString&>(alib::StringDataFactory::fromString<string::String>("\"" + string_str + "\"").getData());
 
-    regexp::RegExpIntegral i;
+    std::cout << alib::StringDataFactory::toString<regexp::RegExp>(regexp::RegExpIntegral::integral(regexp, string)) << " == " << result << std::endl;
 
-    // TODO
-    // CPPUNIT_ASSERT(alib::StringDataFactory::toString<regexp::RegExp>(i.integral(regexp, string)) == result);
+    CPPUNIT_ASSERT(alib::StringDataFactory::toString<regexp::RegExp>(regexp::RegExpIntegral::integral(regexp, string)) == result);
 }