diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
index 5a245390d515120016d7144d0e07b5c54036ba35..bea051e72549e37cc268915a4881b95dc5a1aa41 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRAdaptive.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
+   Legacy::CSR< int,    TNL::Devices::Host, int,  Legacy::CSRAdaptive >,
+   Legacy::CSR< float,  TNL::Devices::Host, int,  Legacy::CSRAdaptive >,
+   Legacy::CSR< double, TNL::Devices::Host, int,  Legacy::CSRAdaptive >,
+   Legacy::CSR< int,    TNL::Devices::Host, long, Legacy::CSRAdaptive >,
+   Legacy::CSR< float,  TNL::Devices::Host, long, Legacy::CSRAdaptive >,
+   Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRAdaptive >
 #ifdef HAVE_CUDA
-   Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRAdaptive >,
+  ,Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRAdaptive >,
    Legacy::CSR< float,  TNL::Devices::Cuda, int,  Legacy::CSRAdaptive >,
    Legacy::CSR< double, TNL::Devices::Cuda, int,  Legacy::CSRAdaptive >,
    Legacy::CSR< int,    TNL::Devices::Cuda, long, Legacy::CSRAdaptive >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
index 9c495da01ee02ef058d7d9020608f3398c579018..db55ae72e77a44223aab8b5f2748fe64c4c77a6c 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLight.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
+   Legacy::CSR< int,    TNL::Devices::Host, int,  Legacy::CSRLight >,
+   Legacy::CSR< float,  TNL::Devices::Host, int,  Legacy::CSRLight >,
+   Legacy::CSR< double, TNL::Devices::Host, int,  Legacy::CSRLight >,
+   Legacy::CSR< int,    TNL::Devices::Host, long, Legacy::CSRLight >,
+   Legacy::CSR< float,  TNL::Devices::Host, long, Legacy::CSRLight >,
+   Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRLight >
 #ifdef HAVE_CUDA
-   Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRLight >,
+  ,Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRLight >,
    Legacy::CSR< float,  TNL::Devices::Cuda, int,  Legacy::CSRLight >,
    Legacy::CSR< double, TNL::Devices::Cuda, int,  Legacy::CSRLight >,
    Legacy::CSR< int,    TNL::Devices::Cuda, long, Legacy::CSRLight >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
index 553bda6643ad27d77c904ef5177affb7cd12a252..f8ad09c49c41d4f6b432e170b0c25003af87b3fa 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRLightWithoutAtomic.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
+   Legacy::CSR< int,    TNL::Devices::Host, int,  Legacy::CSRLightWithoutAtomic >,
+   Legacy::CSR< float,  TNL::Devices::Host, int,  Legacy::CSRLightWithoutAtomic >,
+   Legacy::CSR< double, TNL::Devices::Host, int,  Legacy::CSRLightWithoutAtomic >,
+   Legacy::CSR< int,    TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >,
+   Legacy::CSR< float,  TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >,
+   Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRLightWithoutAtomic >
 #ifdef HAVE_CUDA
-   Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRLightWithoutAtomic >,
+  ,Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRLightWithoutAtomic >,
    Legacy::CSR< float,  TNL::Devices::Cuda, int,  Legacy::CSRLightWithoutAtomic >,
    Legacy::CSR< double, TNL::Devices::Cuda, int,  Legacy::CSRLightWithoutAtomic >,
    Legacy::CSR< int,    TNL::Devices::Cuda, long, Legacy::CSRLightWithoutAtomic >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
index fbab0318c618a19a11936d437292b5654e3f7322..e96aed736a38cc59b74646df1f77bb7b4f09cab3 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRMultiVector.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
+   Legacy::CSR< int,    TNL::Devices::Host, int,  Legacy::CSRMultiVector >,
+   Legacy::CSR< float,  TNL::Devices::Host, int,  Legacy::CSRMultiVector >,
+   Legacy::CSR< double, TNL::Devices::Host, int,  Legacy::CSRMultiVector >,
+   Legacy::CSR< int,    TNL::Devices::Host, long, Legacy::CSRMultiVector >,
+   Legacy::CSR< float,  TNL::Devices::Host, long, Legacy::CSRMultiVector >,
+   Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRMultiVector >
 #ifdef HAVE_CUDA
-   Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRMultiVector >,
+  ,Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRMultiVector >,
    Legacy::CSR< float,  TNL::Devices::Cuda, int,  Legacy::CSRMultiVector >,
    Legacy::CSR< double, TNL::Devices::Cuda, int,  Legacy::CSRMultiVector >,
    Legacy::CSR< int,    TNL::Devices::Cuda, long, Legacy::CSRMultiVector >,
diff --git a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
index 34329467aa4d179080b95e897387e4cb3695ae0b..461053df0645469d94fd9d797edb24a0045fdd7a 100644
--- a/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
+++ b/src/UnitTests/Matrices/Legacy/Legacy_SparseMatrixTest_CSRVector.h
@@ -29,8 +29,14 @@ using namespace TNL::Benchmarks::SpMV::ReferenceFormats;
 // types for which MatrixTest is instantiated
 using CSRMatrixTypes = ::testing::Types
 <
+   Legacy::CSR< int,    TNL::Devices::Host, int,  Legacy::CSRVector >,
+   Legacy::CSR< float,  TNL::Devices::Host, int,  Legacy::CSRVector >,
+   Legacy::CSR< double, TNL::Devices::Host, int,  Legacy::CSRVector >,
+   Legacy::CSR< int,    TNL::Devices::Host, long, Legacy::CSRVector >,
+   Legacy::CSR< float,  TNL::Devices::Host, long, Legacy::CSRVector >,
+   Legacy::CSR< double, TNL::Devices::Host, long, Legacy::CSRVector >
 #ifdef HAVE_CUDA
-   Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRVector >,
+  ,Legacy::CSR< int,    TNL::Devices::Cuda, int,  Legacy::CSRVector >,
    Legacy::CSR< float,  TNL::Devices::Cuda, int,  Legacy::CSRVector >,
    Legacy::CSR< double, TNL::Devices::Cuda, int,  Legacy::CSRVector >,
    Legacy::CSR< int,    TNL::Devices::Cuda, long, Legacy::CSRVector >,