diff --git a/toolkit/include/toolkit/box-algorithms/ovtkTBoxAlgorithm.h b/toolkit/include/toolkit/box-algorithms/ovtkTBoxAlgorithm.h
index 6367fa998608aad4fe4b18563e2383033b961e0e..57927fdd760c1c7a0528a6e8a595b9e8d39d7b9f 100755
--- a/toolkit/include/toolkit/box-algorithms/ovtkTBoxAlgorithm.h
+++ b/toolkit/include/toolkit/box-algorithms/ovtkTBoxAlgorithm.h
@@ -14,37 +14,37 @@ public:
 	// ====================================================================================================================================
 
 private:
-	virtual uint64_t getClockFrequency(Kernel::IBoxAlgorithmContext& ctx)
+	uint64_t getClockFrequency(Kernel::IBoxAlgorithmContext& ctx) override
 	{
 		CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return getClockFrequency();
 	}
 
-	virtual bool initialize(Kernel::IBoxAlgorithmContext& ctx)
+	bool initialize(Kernel::IBoxAlgorithmContext& ctx) override
 	{
 		CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return initialize();
 	}
 
-	virtual bool uninitialize(Kernel::IBoxAlgorithmContext& ctx)
+	bool uninitialize(Kernel::IBoxAlgorithmContext& ctx) override
 	{
 		CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return uninitialize();
 	}
 
-	virtual bool processClock(Kernel::IBoxAlgorithmContext& ctx, Kernel::CMessageClock& msg)
+	bool processClock(Kernel::IBoxAlgorithmContext& ctx, Kernel::CMessageClock& msg) override
 	{
 		CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return processClock(msg);
 	}
 
-	virtual bool processInput(Kernel::IBoxAlgorithmContext& ctx, const size_t index)
+	bool processInput(Kernel::IBoxAlgorithmContext& ctx, const size_t index) override
 	{
 		CScopedBoxAlgorithm scopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return processInput(index);
 	}
 
-	virtual bool process(Kernel::IBoxAlgorithmContext& ctx)
+	bool process(Kernel::IBoxAlgorithmContext& ctx) override
 	{
 		CScopedBoxAlgorithm oScopedBoxAlgorithm(m_boxAlgorithmCtx, &ctx);
 		return process();
diff --git a/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp b/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
index 611aca165a7734852c7925158dda9b4fa1494adc..0326c6544fb45858fc92a654612cab14367d31f6 100755
--- a/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
+++ b/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
@@ -57,8 +57,7 @@ bool testMatrix(OpenViBE::CMatrix& expectedMatrix, const std::string& textFile,
 		std::cerr << "Error: loading matrix from file " << textFile << "\n";
 		return false;
 	}
-
-	if (!OpenViBE::Toolkit::Matrix::isDescriptionSimilar(expectedMatrix, resultMatrix)) {
+	if (!expectedMatrix.isDescriptionEqual(resultMatrix)) {
 		std::cerr << "Error: Descriptions differ between expected matrix and result matrix after save/load\n";
 		return false;
 	}