diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 9d9f81516b0cd2611484ee9e3e06e838833200db..91a55dacf4cdea1aa696a33ecc84a878510c33c3 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -3,7 +3,7 @@ Include(FetchContent)
 FetchContent_Declare(
   Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.0.1 # or a later release
+  GIT_TAG        v3.7.1 # or a later release
 )
 
 FetchContent_MakeAvailable(Catch2)
diff --git a/unit_tests/Test_TensorImpl.cpp b/unit_tests/Test_TensorImpl.cpp
index 7ef7d5f7cbffe03b5f642897c2f2256caebf77e4..16e68bcce3bfc7c3dcd3d6999755667931e4835d 100644
--- a/unit_tests/Test_TensorImpl.cpp
+++ b/unit_tests/Test_TensorImpl.cpp
@@ -21,9 +21,7 @@ using namespace Aidge;
 TEST_CASE("Tensor creation opencv", "[Tensor][OpenCV]") {
     SECTION("from const array") {
         Tensor x;
-        x.setDataType(Aidge::DataType::Int32);
-        x.setBackend("opencv");
-        x = Array3D<int,2,2,2>{
+        x = Array3D<cpptype_t<DataType::Int32>,2,2,2>{
         {
             {
                 {1, 2},
@@ -34,11 +32,10 @@ TEST_CASE("Tensor creation opencv", "[Tensor][OpenCV]") {
                 {7, 8}
             }
         }};
+        x.setBackend("opencv");
 
         Tensor xCopy;
-        xCopy.setDataType(Aidge::DataType::Int32);
-        xCopy.setBackend("opencv");
-        xCopy = Array3D<int,2,2,2>{
+        xCopy = Array3D<cpptype_t<DataType::Int32>,2,2,2>{
         {
             {
                 {1, 2},
@@ -49,10 +46,9 @@ TEST_CASE("Tensor creation opencv", "[Tensor][OpenCV]") {
                 {7, 8}
             }
         }};
+        xCopy.setBackend("opencv");
 
-        Tensor xFloat;
-        xFloat.setBackend("opencv");
-        xFloat = Array3D<float,2,2,2>{
+        Tensor xFloat{Array3D<cpptype_t<DataType::Float32>,2,2,2>{
         {
             {
                 {1., 2.},
@@ -62,7 +58,8 @@ TEST_CASE("Tensor creation opencv", "[Tensor][OpenCV]") {
                 {5., 6.},
                 {7., 8.}
             }
-        }};
+        }}};
+        xFloat.setBackend("opencv");
 
         SECTION("Tensor features") {
             REQUIRE(x.nbDims() == 3);