diff --git a/src/UnitTests/Matrices/SparseMatrixTest.h b/src/UnitTests/Matrices/SparseMatrixTest.h
index 7c4309aaa3844e94a9a0ae7732f79f7bcb5c4b3b..6e6ebe1f06068f00d9392def891a37bdb70c197f 100644
--- a/src/UnitTests/Matrices/SparseMatrixTest.h
+++ b/src/UnitTests/Matrices/SparseMatrixTest.h
@@ -343,31 +343,31 @@ protected:
 // types for which MatrixTest is instantiated
 using ChEllpackMatrixTypes = ::testing::Types
 <
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, short >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, short >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, short >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >,
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, int >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, int >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, int >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >,
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, long >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, long >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, long >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >,
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, short >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, short >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, short >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >,
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, int >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, int >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, int >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >,
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Host, long >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Host, long >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Host, long >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >,
 #ifdef HAVE_CUDA
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, short >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, short >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, short >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >,
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, int >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, int >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, int >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >,
-//    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, long >,
-//    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, long >,
-//    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, long >,
-//    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long >
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, short >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, short >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, short >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >,
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, int >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, int >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, int >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >,
+    TNL::Matrices::ChunkedEllpack< int,    TNL::Devices::Cuda, long >,
+    TNL::Matrices::ChunkedEllpack< long,   TNL::Devices::Cuda, long >,
+    TNL::Matrices::ChunkedEllpack< float,  TNL::Devices::Cuda, long >,
+    TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long >
 #endif
 >;
 
@@ -461,30 +461,30 @@ protected:
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
-//    TNL::Matrices::CSR< int,    TNL::Devices::Host, short >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Host, short >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Host, short >,
-//    TNL::Matrices::CSR< double, TNL::Devices::Host, short >,
-//    TNL::Matrices::CSR< int,    TNL::Devices::Host, int >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Host, int >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Host, int >,
-//    TNL::Matrices::CSR< double, TNL::Devices::Host, int >,
-//    TNL::Matrices::CSR< int,    TNL::Devices::Host, long >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Host, long >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Host, long >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Host, short >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Host, short >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Host, short >,
+    TNL::Matrices::CSR< double, TNL::Devices::Host, short >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Host, int >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Host, int >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Host, int >,
+    TNL::Matrices::CSR< double, TNL::Devices::Host, int >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Host, long >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Host, long >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Host, long >,
     TNL::Matrices::CSR< double, TNL::Devices::Host, long >,
 #ifdef HAVE_CUDA
-//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, short >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, short >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, short >,
-//    TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >,
-//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, int >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, int >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, int >,
-//    TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >,
-//    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, long >,
-//    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, long >,
-//    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, long >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, short >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, short >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, short >,
+    TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, int >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, int >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, int >,
+    TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >,
+    TNL::Matrices::CSR< int,    TNL::Devices::Cuda, long >,
+    TNL::Matrices::CSR< long,   TNL::Devices::Cuda, long >,
+    TNL::Matrices::CSR< float,  TNL::Devices::Cuda, long >,
     TNL::Matrices::CSR< double, TNL::Devices::Cuda, long >
 #endif
 >;
@@ -579,31 +579,31 @@ protected:
 // types for which MatrixTest is instantiated
 using EllpackMatrixTypes = ::testing::Types
 <
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, short >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, short >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, short >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >,
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, int >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, int >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, int >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >,
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, long >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, long >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, long >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >,
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, short >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, short >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, short >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >,
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, int >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, int >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, int >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >,
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Host, long >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Host, long >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Host, long >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >,
 #ifdef HAVE_CUDA
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, short >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, short >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, short >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >,
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, int >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, int >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, int >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >,
-//    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, long >,
-//    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, long >,
-//    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, long >,
-//    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long >
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, short >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, short >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, short >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >,
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, int >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, int >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, int >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >,
+    TNL::Matrices::Ellpack< int,    TNL::Devices::Cuda, long >,
+    TNL::Matrices::Ellpack< long,   TNL::Devices::Cuda, long >,
+    TNL::Matrices::Ellpack< float,  TNL::Devices::Cuda, long >,
+    TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long >
 #endif
 >;
 
@@ -697,31 +697,31 @@ protected:
 // types for which MatrixTest is instantiated
 using SlicedEllpackMatrixTypes = ::testing::Types
 <
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, short >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, short >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, short >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >,
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, int >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, int >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, int >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >,
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, long >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, long >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, long >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >,
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, short >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, short >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, short >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >,
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, int >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, int >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, int >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >,
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Host, long >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Host, long >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Host, long >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >,
 #ifdef HAVE_CUDA
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, short >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, short >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, short >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >,
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, int >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, int >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, int >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >,
-//    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, long >,
-//    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, long >,
-//    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, long >,
-//    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long >
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, short >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, short >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, short >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >,
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, int >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, int >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, int >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >,
+    TNL::Matrices::SlicedEllpack< int,    TNL::Devices::Cuda, long >,
+    TNL::Matrices::SlicedEllpack< long,   TNL::Devices::Cuda, long >,
+    TNL::Matrices::SlicedEllpack< float,  TNL::Devices::Cuda, long >,
+    TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long >
 #endif
 >;