diff --git a/alib2algo/test-src/automaton/determinize/determinizeTest.cpp b/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
index 66b5ea9f40adb6f6ffc68055bb3ee51ce179e82b..67d3a88216e41658cf0942080af46ce42fe6a7c0 100644
--- a/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
+++ b/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
@@ -10,8 +10,6 @@
 
 #include "automaton/determinize/Determinize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( determinizeTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( determinizeTest );
 
diff --git a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
index 3ceffeabb7d4cfd97e379bff1f4c63ed676e874a..9c0eef59d7e2f6b6c80fc0392d1d6f99ba82c538 100644
--- a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
@@ -7,8 +7,6 @@
 
 #include "automaton/FSM/MultiInitialStateNFA.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FSMSingleInitialStateTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( FSMSingleInitialStateTest );
 
diff --git a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
index 9501072b2ebb04934107f519416989eb55452902..d0ed481f4f4176b9ba47355ad0ac8d5acb107872 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
@@ -6,8 +6,6 @@
 #include "automaton/simplify/Trim.h"
 #include "automaton/simplify/Normalize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( minimizeBrzozowskiTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( minimizeBrzozowskiTest );
 
diff --git a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
index 2a15aac8417db10f67a738ce09658372983afcb6..bf891143c2e444223d1ef011ceeeedc7f933231f 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
@@ -3,8 +3,6 @@
 
 #include "automaton/simplify/Minimize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( minimizeTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( minimizeTest );
 
diff --git a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
index 06316d5a2d011ebf468c6b34ac09354f3e060fde..2c5d8ccadef090d2673d9ac6debb383b5fa817f2 100644
--- a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
@@ -3,8 +3,6 @@
 
 #include "automaton/simplify/Normalize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( normalizeTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( normalizeTest );
 
diff --git a/alib2algo/test-src/automaton/simplify/trimTest.cpp b/alib2algo/test-src/automaton/simplify/trimTest.cpp
index f8abc7b7a933deb7f70cf883d42b5418598665d1..6c17786b04a6ea273287ecb6e0ef9d5591dca9bb 100644
--- a/alib2algo/test-src/automaton/simplify/trimTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/trimTest.cpp
@@ -7,8 +7,6 @@
 #include "automaton/FSM/DFA.h"
 #include "grammar/Regular/RightRG.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( trimTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( trimTest );
 
diff --git a/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp b/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
index 4e7138102b829a854e434e349d8327fa991fd198..b9dc7371455fc645ad19593c17e5b057333fda65 100644
--- a/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
@@ -5,8 +5,6 @@
 #include <automaton/FSM/DFA.h>
 #include <automaton/FSM/CompactNFA.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataCompactionTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomataCompactionTest );
 
diff --git a/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp b/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
index 688977ccc3162f7b7bd8d50e0e4c6a2ed5ab7c70..a49ae2125563d5579670b58109945eb53b8c5404 100644
--- a/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
@@ -11,8 +11,6 @@
 #include "automaton/simplify/Total.h"
 #include "automaton/determinize/Determinize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataConcatenationTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomataConcatenationTest );
 
diff --git a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
index ccebb48f9abe890fa7ec68abcafd2d15d1535d8b..7eb0e5af85f18e419dc22e8edd8baabe3330ceab 100644
--- a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
@@ -12,8 +12,6 @@
 
 #include <exception/CommonException.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataUnionTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomataUnionTest );
 
diff --git a/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp b/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
index 75d72b2a78cc4fb9b9dc9be0bb09d8cb944917ff..27e2dfdaf4bbb7c6acc8dba860ec0b0b962750a9 100644
--- a/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
@@ -11,8 +11,6 @@
 #include "automaton/simplify/Total.h"
 #include "automaton/determinize/Determinize.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonIterationTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonIterationTest );
 
diff --git a/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp b/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
index 0d7ea54da8794b0559e7c7f02d88db49323d0d42..aa4a2ea8a46f0877c9d6d8e0c6897c7e78256c82 100644
--- a/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
+++ b/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
@@ -8,8 +8,6 @@
 
 #include <factory/StringDataFactory.hpp>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarGenerateUpToLength, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarGenerateUpToLength );
 
diff --git a/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp b/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
index 6d9012befb6182db6c9b65fb435b076a9411bdff..dcc270198fe14ef5540c2cb569d946b1db584db6 100644
--- a/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
+++ b/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
@@ -8,8 +8,6 @@
 #include "grammar/properties/NonterminalUnitRuleCycle.h"
 #include "grammar/properties/RecursiveNonterminal.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarPropertiesTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarPropertiesTest );
 
diff --git a/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
index 833c6544f98e08dded79a0084d076fe131f5a075..cc535a8ac9776b6366e191534c187ff0bce8146c 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
@@ -5,8 +5,6 @@
 #include "grammar/ContextFree/CFG.h"
 #include "grammar/ContextFree/EpsilonFreeCFG.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarEpsilonRemoverTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarEpsilonRemoverTest );
 
diff --git a/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
index 440d5a5a0c79c50e3b67ad9482f2002e69f105b7..6deb01082c8cc15cea4717bb51faeab457d1bba3 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
@@ -9,8 +9,6 @@
 #include <factory/StringDataFactory.hpp>
 #include <common/createUnique.hpp>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarLeftRecursionRemoverTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarLeftRecursionRemoverTest );
 
diff --git a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
index d774ad5ee5d808f11c72a11fac11614b76e642b8..4b75a48ad783eb85f0936e9c02fa035d43c6799f 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
@@ -5,8 +5,6 @@
 #include "grammar/ContextFree/CFG.h"
 #include "grammar/ContextFree/EpsilonFreeCFG.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarSimpleRulesRemoverTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarSimpleRulesRemoverTest );
 
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
index 71da54971b4ea3a3084a35ff63ba96559288522b..153db1a2113f7915f2592c7cbc3f30c1d671d862 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
@@ -9,8 +9,6 @@
 
 #include <common/DefaultSymbolsPairType.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarToCNFTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarToCNFTest );
 
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
index 166eea59c83c4eed5fbb856320166fbff77cc9cd..0a701b47bd7ad1aa16fe39c62e1a321047d94a88 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
@@ -9,8 +9,6 @@
 #include <factory/StringDataFactory.hpp>
 #include <common/createUnique.hpp>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarToGNFTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarToGNFTest );
 
diff --git a/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp b/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
index f68c6034a27ecd6527035720b78439526db2b9d7..3facdea2478f21037ade54d4939d605bb9639a2f 100644
--- a/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
+++ b/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
@@ -4,8 +4,6 @@
 #include "grammar/convert/ToGrammarLeftRG.h"
 #include "grammar/convert/ToGrammarRightRG.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rg2rgTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( rg2rgTest );
 
diff --git a/alib2algo/test-src/playTest.cpp b/alib2algo/test-src/playTest.cpp
index a8cf3c2a8cea48b2ded57ddf53e4117e668b0949..0b2395adec7c41a41c22afb7187ab9f1199da640 100644
--- a/alib2algo/test-src/playTest.cpp
+++ b/alib2algo/test-src/playTest.cpp
@@ -11,8 +11,6 @@
 #include "automaton/simplify/Trim.h"
 #include "automaton/simplify/EpsilonRemoverIncoming.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 #define TEST_ITERATIONS 100
 #define TEST_AUTOMATON_STATES_MAX 18
 #define TEST_AUTOMATON_DENSITY_MAX 2.5
diff --git a/alib2algo/test-src/regexp/RegExpTest.cpp b/alib2algo/test-src/regexp/RegExpTest.cpp
index 33ba87d8e1f038c6c98944f1911ac2f1c6305ee7..079de0f9539e9566e989e58c80c8cde3225ed62f 100644
--- a/alib2algo/test-src/regexp/RegExpTest.cpp
+++ b/alib2algo/test-src/regexp/RegExpTest.cpp
@@ -15,9 +15,6 @@
 
 #include <factory/StringDataFactory.hpp>
 
-#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( RegExpTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( RegExpTest );
 
diff --git a/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp b/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
index 8f4133f53ec87047a37b928bd3dd255d0ff79f00..6dbcb6d43349c88fe0fed4e5b6315e63217b6076 100644
--- a/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
+++ b/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
@@ -9,9 +9,6 @@
 
 #include <primitive/Character.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpOptimizeTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RegExpOptimizeTest );
 
diff --git a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
index e45ed7a8038036b6cc0d00fd382753e4db7a0a8b..196c14f412a796a1d704023494820fd6d35faca1 100644
--- a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
@@ -6,8 +6,6 @@
 #include <factory/StringDataFactory.hpp>
 #include "factory/XmlDataFactory.hpp"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpDerivationTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RegExpDerivationTest );
 
diff --git a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
index 1973f5fdcad8a50cedc6cb530b71e7e225ed2503..2ad4d370895f92640c0eda1a15e341b6a15a18b9 100644
--- a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
@@ -5,8 +5,6 @@
 
 #include <factory/StringDataFactory.hpp>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpIntegralTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RegExpIntegralTest );
 
diff --git a/alib2algo/test-src/string/compare/compareTest.cpp b/alib2algo/test-src/string/compare/compareTest.cpp
index 6c0b8cbe3266212976a26beb98e8d16275593273..3e533ceb0bb41736d05fd422e75af659eeb8b91f 100644
--- a/alib2algo/test-src/string/compare/compareTest.cpp
+++ b/alib2algo/test-src/string/compare/compareTest.cpp
@@ -8,8 +8,6 @@
 #include "string/CyclicString.h"
 #include "string/Epsilon.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( compareTest, "string" );
 CPPUNIT_TEST_SUITE_REGISTRATION( compareTest );
 
diff --git a/alib2algo/test-src/string/properties/borderArrayTest.cpp b/alib2algo/test-src/string/properties/borderArrayTest.cpp
index 0381b37fbe32d2e3a2d2ab55de559a966c4f0115..7b5cd679e4a027f32e7dfba294d52849cefe14ff 100644
--- a/alib2algo/test-src/string/properties/borderArrayTest.cpp
+++ b/alib2algo/test-src/string/properties/borderArrayTest.cpp
@@ -3,8 +3,6 @@
 #include <string/String.h>
 #include <string/properties/BorderArray.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( borderArrayTest, "stringology" );
 CPPUNIT_TEST_SUITE_REGISTRATION( borderArrayTest );
 
diff --git a/alib2algo/test-src/stringology/exact/stringMatchTest.cpp b/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
index 06fd7d387ce15790474888f6168a2c88f6e65d2d..73d281b2dfb0369e571cbe5aedd11635dde332bd 100644
--- a/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
+++ b/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
@@ -4,8 +4,6 @@
 #include <string/LinearString.h>
 #include <stringology/exact/ExactFactorMatch.h>
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( stringMatchTest, "string" );
 CPPUNIT_TEST_SUITE_REGISTRATION( stringMatchTest );
 
diff --git a/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp b/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
index c015081bc7d4cde0017c3341c49f694caf0b65ce..59092bd96084ecd85527825351112ec8a5c08856 100644
--- a/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
+++ b/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
@@ -2,8 +2,6 @@
 
 #include "graph/sort/TopologicalSort.h"
 
-#define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphTopologicalSortTest, "graph" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GraphTopologicalSortTest );
 
@@ -33,7 +31,7 @@ void GraphTopologicalSortTest::testSort1()
 	graph::sort::TopologicalSort::Result res;
 	res = graph::sort::TopologicalSort::topologicalsort(dg);
 
-	CPPUNIT_ASSERT_EQUAL_INT(6, res.size());
+	CPPUNIT_ASSERT_EQUAL(6, (int) res.size());
 
 	CPPUNIT_ASSERT_EQUAL(n1, *res.begin());
 	res.erase(res.begin());
diff --git a/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp b/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
index 244abd6e60e9be8423bdae7f89e62959ce2a9c0d..e7fe48851279b422a847dfb3841582c58c436782 100644
--- a/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
@@ -7,8 +7,6 @@
 #include "string/generate/RandomStringFactory.h"
 #include "string/generate/RandomSubstringFactory.h"
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( BackwardNondeterministicDAWGMatchingTest, "stringology" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( BackwardNondeterministicDAWGMatchingTest );
 
diff --git a/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp b/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
index eee6b4134410bed079ba8e4277c9fb27c6a54e77..e71878e082582419854a7be80eb86eb99fbbb613 100644
--- a/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
@@ -8,8 +8,6 @@
 #include "string/generate/RandomStringFactory.h"
 #include "string/generate/RandomSubstringFactory.h"
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( FactorOracleAutomatonTest, "stringology" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( FactorOracleAutomatonTest );
 
diff --git a/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp b/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
index bea6adf057f0dbc7dd6e701e63ce9cd527d24a4d..10c9a6c536056c1a1d6b50bbd5f38d7515ae6dad 100644
--- a/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
@@ -8,8 +8,6 @@
 #include "string/generate/RandomStringFactory.h"
 #include "string/generate/RandomSubstringFactory.h"
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SuffixAutomatonTest, "stringology" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( SuffixAutomatonTest );
 
diff --git a/alib2common/test-src/common/CreateUniqueTest.cpp b/alib2common/test-src/common/CreateUniqueTest.cpp
index d99c4c2e717e30944830185f06ab03779f545072..f834f1e724cee5318fe2db13975744c0accd07e7 100644
--- a/alib2common/test-src/common/CreateUniqueTest.cpp
+++ b/alib2common/test-src/common/CreateUniqueTest.cpp
@@ -2,9 +2,6 @@
 
 #include <common/createUnique.hpp>
 
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( CreateUniqueTest, "common" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( CreateUniqueTest );
 
diff --git a/alib2common/test-src/container/ContainerTest.cpp b/alib2common/test-src/container/ContainerTest.cpp
index deccbb04ec11c3dae9d8dff08f39d8518b7515bd..bc4d5a142da921b831f98aba90e72a7964f64be3 100644
--- a/alib2common/test-src/container/ContainerTest.cpp
+++ b/alib2common/test-src/container/ContainerTest.cpp
@@ -17,9 +17,6 @@
 
 #include <type_traits>
 
-#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ContainerTest, "container" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( ContainerTest );
 
diff --git a/alib2common/test-src/object/AnyObjectTest.cpp b/alib2common/test-src/object/AnyObjectTest.cpp
index a7af28e6cfd36a33277787b1aa9e343be795845b..df2fd7e34b8604cb21fd86cc8e96433df44d8a94 100644
--- a/alib2common/test-src/object/AnyObjectTest.cpp
+++ b/alib2common/test-src/object/AnyObjectTest.cpp
@@ -10,9 +10,6 @@
 
 #include "factory/XmlDataFactory.hpp"
 
-#define CPPUNIT_IMPLY( x, y )	CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( AnyObjectTest, "object" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( AnyObjectTest );
 
diff --git a/alib2common/test-src/object/ObjectTest.cpp b/alib2common/test-src/object/ObjectTest.cpp
index 4f08f9e2db0573917c480b8b44e248c664ebb09d..d3883de7d144c1c1ce7d4090f4c6b763a41f8786 100644
--- a/alib2common/test-src/object/ObjectTest.cpp
+++ b/alib2common/test-src/object/ObjectTest.cpp
@@ -12,9 +12,6 @@
 
 #include <type_traits>
 
-#define CPPUNIT_IMPLY( x, y )	CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ObjectTest, "object" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( ObjectTest );
 
diff --git a/alib2common/test-src/primitive/PrimitiveTest.cpp b/alib2common/test-src/primitive/PrimitiveTest.cpp
index 6b771feee1e5e968dda4d9ab14ea903f42eaf075..ab9a79279c916357366373b4c43a7d75675ad4a0 100644
--- a/alib2common/test-src/primitive/PrimitiveTest.cpp
+++ b/alib2common/test-src/primitive/PrimitiveTest.cpp
@@ -9,8 +9,6 @@
 #include "factory/XmlDataFactory.hpp"
 #include <algorithm>
 
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PrimitiveTest, "primitive" );
 CPPUNIT_TEST_SUITE_REGISTRATION( PrimitiveTest );
 
diff --git a/alib2common/test-src/sax/SaxTest.cpp b/alib2common/test-src/sax/SaxTest.cpp
index d5d5ffcf83317365729dfe2a4a288685bd85eae3..04a274a2642d34255986d41b178488bfdf6bb488 100644
--- a/alib2common/test-src/sax/SaxTest.cpp
+++ b/alib2common/test-src/sax/SaxTest.cpp
@@ -5,8 +5,6 @@
 #include "sax/SaxParseInterface.h"
 #include "sax/SaxComposeInterface.h"
 
-#define CPPUNIT_EXCLUSIVE_OR( x, y )    CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SaxTest, "sax" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( SaxTest );
 
diff --git a/alib2data/test-src/alphabet/SymbolTest.cpp b/alib2data/test-src/alphabet/SymbolTest.cpp
index 50b6209efeb674ef77f352db3013f42135f19598..636cdbc0f525f63ab93ed06d6267f6d697462918 100644
--- a/alib2data/test-src/alphabet/SymbolTest.cpp
+++ b/alib2data/test-src/alphabet/SymbolTest.cpp
@@ -16,9 +16,6 @@
 
 #include "factory/XmlDataFactory.hpp"
 
-#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SymbolTest, "alphabet" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( SymbolTest );
 
diff --git a/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp b/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
index dd9abf6f26a92d4d450940a5da963a032abbd417..22e884acf6d04483b4974dbdab5bad73ebd41e52 100644
--- a/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
+++ b/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
@@ -14,8 +14,6 @@
 
 #include <object/Object.h>
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( AutomatonTemplatesTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( AutomatonTemplatesTest );
 
diff --git a/alib2data/test-src/automaton/AutomatonTest.cpp b/alib2data/test-src/automaton/AutomatonTest.cpp
index a09e9e7213b0541b3a476e816371743278017608..49e6f17d10608c1a04e2a2dd210b4a6c5146b93f 100644
--- a/alib2data/test-src/automaton/AutomatonTest.cpp
+++ b/alib2data/test-src/automaton/AutomatonTest.cpp
@@ -22,8 +22,6 @@
 #include "regexp/unbounded/UnboundedRegExp.h"
 #include "regexp/unbounded/UnboundedRegExpElements.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonTest );
 
diff --git a/alib2data/test-src/common/SparseBoolVectorTest.cpp b/alib2data/test-src/common/SparseBoolVectorTest.cpp
index a0e7fad72a32d2af5e0029ae1406d24095e72307..1b2412ba71b766ff5314be397aba84a9d7c4fbe6 100644
--- a/alib2data/test-src/common/SparseBoolVectorTest.cpp
+++ b/alib2data/test-src/common/SparseBoolVectorTest.cpp
@@ -4,9 +4,6 @@
 
 #include <factory/XmlDataFactory.hpp>
 
-#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SparseBoolVectorTest, "common" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( SparseBoolVectorTest );
 
diff --git a/alib2data/test-src/grammar/GrammarTest.cpp b/alib2data/test-src/grammar/GrammarTest.cpp
index 1b5c3b6413292e32b25040f231631f0b6e471918..ad415b66c2b789838eba4f5cdea2b6d8a4454346 100644
--- a/alib2data/test-src/grammar/GrammarTest.cpp
+++ b/alib2data/test-src/grammar/GrammarTest.cpp
@@ -23,8 +23,6 @@
 
 #include "alphabet/LabeledSymbol.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarTest );
 
diff --git a/alib2data/test-src/label/LabelTest.cpp b/alib2data/test-src/label/LabelTest.cpp
index c3bbc603fa6e3e035daac6c265c5e9f4ce8f41da..4c2dee78d0467bb04e8ecf6daf2dccc2b40fbbb6 100644
--- a/alib2data/test-src/label/LabelTest.cpp
+++ b/alib2data/test-src/label/LabelTest.cpp
@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <type_traits>
 
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LabelTest, "label" );
 CPPUNIT_TEST_SUITE_REGISTRATION( LabelTest );
 
diff --git a/alib2data/test-src/regexp/RegExpTest.cpp b/alib2data/test-src/regexp/RegExpTest.cpp
index bc0812774c0bf4f9c7db3510e269c42a803e6c64..353f696580785bc0fefd8f7946cc7812ac7065e3 100644
--- a/alib2data/test-src/regexp/RegExpTest.cpp
+++ b/alib2data/test-src/regexp/RegExpTest.cpp
@@ -13,9 +13,6 @@
 
 #include "factory/XmlDataFactory.hpp"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RegExpTest );
 
diff --git a/alib2data/test-src/rte/RTETest.cpp b/alib2data/test-src/rte/RTETest.cpp
index 432f777b95cac557ee71da1023cceaba37005d77..1c6aeb22ef656fe5ea63cc97423d52dc4953f93c 100644
--- a/alib2data/test-src/rte/RTETest.cpp
+++ b/alib2data/test-src/rte/RTETest.cpp
@@ -13,9 +13,6 @@
 
 #include "factory/XmlDataFactory.hpp"
 
-#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( RTETest, "rte" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( RTETest );
 
diff --git a/alib2data/test-src/string/StringTest.cpp b/alib2data/test-src/string/StringTest.cpp
index c0438b962ba63f9f03225cf0045c73ef8f21c990..eb9fa29f6d1e99ecb63887dd6c9dbcac4fd0d2c8 100644
--- a/alib2data/test-src/string/StringTest.cpp
+++ b/alib2data/test-src/string/StringTest.cpp
@@ -16,8 +16,6 @@
 #include "alphabet/LabeledSymbol.h"
 #include "alphabet/BlankSymbol.h"
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( StringTest, "string" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( StringTest );
 
diff --git a/alib2data/test-src/tree/PatternTest.cpp b/alib2data/test-src/tree/PatternTest.cpp
index 3b17c0c283024dbcabf4cede0f0737f8521c1837..bea2a26e5586592b88a9642550415ff7fb808023 100644
--- a/alib2data/test-src/tree/PatternTest.cpp
+++ b/alib2data/test-src/tree/PatternTest.cpp
@@ -17,8 +17,6 @@
 #include "alphabet/BarSymbol.h"
 #include "alphabet/VariablesBarSymbol.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PatternTest, "tree" );
 CPPUNIT_TEST_SUITE_REGISTRATION( PatternTest );
 
diff --git a/alib2data/test-src/tree/TreeTest.cpp b/alib2data/test-src/tree/TreeTest.cpp
index 0b796881126ff0d38404e5057c93aa0ed2b3c855..75d177a64361aef859a594dc69e15fcde2d4bb05 100644
--- a/alib2data/test-src/tree/TreeTest.cpp
+++ b/alib2data/test-src/tree/TreeTest.cpp
@@ -17,8 +17,6 @@
 #include "alphabet/SubtreeWildcardSymbol.h"
 #include "alphabet/BarSymbol.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TreeTest, "tree" );
 CPPUNIT_TEST_SUITE_REGISTRATION( TreeTest );
 
diff --git a/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp b/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
index 316d2878b8fe386aa27e5f91f4f550f1aa8df1d0..45de5928ae2002c52eaa1d7531c77c3509f6d369 100644
--- a/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
+++ b/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
@@ -5,8 +5,6 @@
 
 #include "automaton/FSM/DFA.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( trimTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( trimTest );
 
diff --git a/alib2measurepp/test-src/provisioner/provisionerTest.cpp b/alib2measurepp/test-src/provisioner/provisionerTest.cpp
index 3ceabc3d0f33affafda6e3cf1160b53122e04e5c..59bbc7e44ff72b3d4aee9a9f08e6fbad895ef78f 100644
--- a/alib2measurepp/test-src/provisioner/provisionerTest.cpp
+++ b/alib2measurepp/test-src/provisioner/provisionerTest.cpp
@@ -5,8 +5,6 @@
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( provisionerTest, "provisioner" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( provisionerTest );
 
diff --git a/alib2std/src/cppunit/extensions/HelperMacros.h b/alib2std/src/cppunit/extensions/HelperMacros.h
new file mode 100644
index 0000000000000000000000000000000000000000..6132b51190a0a2bfe2ce157a3d1b2d5397d146ed
--- /dev/null
+++ b/alib2std/src/cppunit/extensions/HelperMacros.h
@@ -0,0 +1,10 @@
+#ifndef __CPPUNIT_HELPER_MACROS_WRAPPER_
+#define __CPPUNIT_HELPER_MACROS_WRAPPER_
+
+#include <cppunit/ui/../extensions/HelperMacros.h>
+
+#define CPPUNIT_IMPLY(x,y) CPPUNIT_ASSERT ( ! ( x ) || ( y ) )
+#define CPPUNIT_EXCLUSIVE_OR(x,y) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
+
+#endif /* __CPPUNIT_HELPER_MACROS_WRAPPER_ */
+
diff --git a/alib2std/test-src/extensions/TypeInfoTest.cpp b/alib2std/test-src/extensions/TypeInfoTest.cpp
index 068160f8898e726087eb18a6536e8ded106977e7..1441af3269faec8fdb21010617ccd0b9521daedc 100644
--- a/alib2std/test-src/extensions/TypeInfoTest.cpp
+++ b/alib2std/test-src/extensions/TypeInfoTest.cpp
@@ -2,8 +2,6 @@
 #include <string>
 #include <iostream>
 
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TypeInfoTest, "bits" );
 CPPUNIT_TEST_SUITE_REGISTRATION( TypeInfoTest );
 
diff --git a/alib2str/test-src/automaton/AutomatonTest.cpp b/alib2str/test-src/automaton/AutomatonTest.cpp
index 31f4ec9385aee15c051459ff2e09f2fb4dbd815c..6e7585d0e1a78f0b224136f9a6a6e5a0784a05c4 100644
--- a/alib2str/test-src/automaton/AutomatonTest.cpp
+++ b/alib2str/test-src/automaton/AutomatonTest.cpp
@@ -24,8 +24,6 @@
 #include "regexp/unbounded/UnboundedRegExp.h"
 #include "regexp/unbounded/UnboundedRegExpElements.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonTest, "automaton" );
 CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonTest );
 
diff --git a/alib2str/test-src/grammar/GrammarTest.cpp b/alib2str/test-src/grammar/GrammarTest.cpp
index 9924a5d3ec9c7bf1b5d060f314dc89259cfe5789..27c90c89f322982639a3ecfc3ce83d7d4780e1d7 100644
--- a/alib2str/test-src/grammar/GrammarTest.cpp
+++ b/alib2str/test-src/grammar/GrammarTest.cpp
@@ -26,8 +26,6 @@
 
 #include "alphabet/LabeledSymbol.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarTest, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GrammarTest );
 
diff --git a/alib2str/test-src/object/LabelTest.cpp b/alib2str/test-src/object/LabelTest.cpp
index 539efa1d4b819f9f376bae1a6b5aa2977ef67223..fb218fa9613a289c7f9bab376610642df01963ca 100644
--- a/alib2str/test-src/object/LabelTest.cpp
+++ b/alib2str/test-src/object/LabelTest.cpp
@@ -4,8 +4,6 @@
 
 #include "factory/StringDataFactory.hpp"
 
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LabelTest, "label" );
 CPPUNIT_TEST_SUITE_REGISTRATION( LabelTest );
 
diff --git a/alib2str/test-src/object/ObjectTest.cpp b/alib2str/test-src/object/ObjectTest.cpp
index 14e95db41b54ab24e1a00e6bdd2fdba80fbc9cad..a2147d54410bf7c838a0afdb5c779c5545b2e221 100644
--- a/alib2str/test-src/object/ObjectTest.cpp
+++ b/alib2str/test-src/object/ObjectTest.cpp
@@ -6,8 +6,6 @@
 
 #include <sstream>
 
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ObjectTest, "label" );
 CPPUNIT_TEST_SUITE_REGISTRATION( ObjectTest );
 
diff --git a/alib2str/test-src/object/SymbolTest.cpp b/alib2str/test-src/object/SymbolTest.cpp
index a461d7ed7b6f64c43f9355456df5b2b60dd2d9ab..5b743901b0265d2a05ec34599706e3c5856b7840 100644
--- a/alib2str/test-src/object/SymbolTest.cpp
+++ b/alib2str/test-src/object/SymbolTest.cpp
@@ -4,9 +4,6 @@
 
 #include "factory/StringDataFactory.hpp"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SymbolTest, "alphabet" );
 CPPUNIT_TEST_SUITE_REGISTRATION( SymbolTest );
 
diff --git a/alib2str/test-src/regexp/RegExpTest.cpp b/alib2str/test-src/regexp/RegExpTest.cpp
index a337ac49425f910b67ca3869443246afb85bc9ac..97d308135f4693826292a97bca94f2c70b2cb4a8 100644
--- a/alib2str/test-src/regexp/RegExpTest.cpp
+++ b/alib2str/test-src/regexp/RegExpTest.cpp
@@ -13,9 +13,6 @@
 #include "factory/XmlDataFactory.hpp"
 #include "factory/StringDataFactory.hpp"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpTest, "regexp" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RegExpTest );
 
diff --git a/alib2str/test-src/string/StringTest.cpp b/alib2str/test-src/string/StringTest.cpp
index a2a7cf2bf05d6812ec9926db8c0288327b330e6d..e0ca33655d7b7eaa5d7e432da179d09f3b12be3b 100644
--- a/alib2str/test-src/string/StringTest.cpp
+++ b/alib2str/test-src/string/StringTest.cpp
@@ -16,8 +16,6 @@
 #include "alphabet/LabeledSymbol.h"
 #include "alphabet/BlankSymbol.h"
 
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StringTest, "string" );
 CPPUNIT_TEST_SUITE_REGISTRATION( StringTest );
 
diff --git a/alib2str/test-src/tree/TreeTest.cpp b/alib2str/test-src/tree/TreeTest.cpp
index cc0ac484647f75ac2182fa9bb7b250b833aa0c41..c5a6b240ab75e364478111ae66a87cbea9a277a4 100644
--- a/alib2str/test-src/tree/TreeTest.cpp
+++ b/alib2str/test-src/tree/TreeTest.cpp
@@ -12,8 +12,6 @@
 #include "alphabet/LabeledSymbol.h"
 #include "alphabet/BlankSymbol.h"
 
-#define CPPUNIT_IMPLY( x, y )    CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( TreeTest, "tree" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( TreeTest );
 
diff --git a/alib2str_experimental/test-src/graph/GraphTest.cpp b/alib2str_experimental/test-src/graph/GraphTest.cpp
index 82acd272594ca772fdacfc5cb4217c429ab76f14..f04b7074c88841b1d73eb56c04212e463b04f614 100644
--- a/alib2str_experimental/test-src/graph/GraphTest.cpp
+++ b/alib2str_experimental/test-src/graph/GraphTest.cpp
@@ -18,8 +18,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphTest, "graph" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GraphTest );
 
 
-#define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
-
 template< typename UndirectedGraphImpl, typename DirectedGraphImpl >
 void testStringParser_impl()
 {