diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.hpp b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
index 94e637911a3b0f438195c7de408320e3bf1f7854..98a0fffc7882a9b2de669df9d3ed9927fc7d2aa8 100644
--- a/src/feature_creation/node/value_storage/nodes_value_containers.hpp
+++ b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
@@ -255,7 +255,7 @@ namespace node_value_arrs
     {
         return TEMP_STORAGE_TEST_REG[
             (ind % N_PRIMARY_FEATURES) +
-            (get_op_slot(rung, offset, for_comp) % N_OP_TEST_SLOTS) * N_PRIMARY_FEATURES +
+            (get_op_test_slot(rung, offset, for_comp) % N_OP_TEST_SLOTS) * N_PRIMARY_FEATURES +
             omp_get_thread_num() * (N_PRIMARY_FEATURES * N_OP_TEST_SLOTS + 1)
         ];
     }
diff --git a/tests/googletest/feature_creation/value_storage/test_value_storage.cc b/tests/googletest/feature_creation/value_storage/test_value_storage.cc
index 2929cde7193070f5ebe8ee00f513dd5908d10af3..6e0f2e9504b4fc8038ce19da5bdb7fe7216f3df9 100644
--- a/tests/googletest/feature_creation/value_storage/test_value_storage.cc
+++ b/tests/googletest/feature_creation/value_storage/test_value_storage.cc
@@ -28,11 +28,11 @@ namespace {
         EXPECT_EQ(node_value_arrs::N_STORE_FEATURES, 2);
         EXPECT_EQ(node_value_arrs::N_OP_SLOTS, 0);
         EXPECT_EQ(node_value_arrs::VALUES_ARR.size(), 10);
-        EXPECT_EQ(node_value_arrs::TEST_VALUES_ARR.size(), 4);
+        EXPECT_EQ(node_value_arrs::TEST_VALUES_ARR.size(), 2);
         EXPECT_EQ(node_value_arrs::TEMP_STORAGE_ARR.size(), 0);
         EXPECT_EQ(node_value_arrs::TEMP_STORAGE_REG.size(), 0);
-        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_ARR.size(), 0);
-        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_REG.size(), 0);
+        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_ARR.size(), 28);
+        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_REG.size(), 14);
 
         node_value_arrs::resize_values_arr(1, 2, true);
         EXPECT_EQ(node_value_arrs::N_SAMPLES, 5);
@@ -41,11 +41,11 @@ namespace {
         EXPECT_EQ(node_value_arrs::N_STORE_FEATURES, 2);
         EXPECT_EQ(node_value_arrs::N_OP_SLOTS, 2);
         EXPECT_EQ(node_value_arrs::VALUES_ARR.size(), 10);
-        EXPECT_EQ(node_value_arrs::TEST_VALUES_ARR.size(), 4);
+        EXPECT_EQ(node_value_arrs::TEST_VALUES_ARR.size(), 2);
         EXPECT_EQ(node_value_arrs::TEMP_STORAGE_ARR.size(), node_value_arrs::MAX_N_THREADS * (2 * 2 + 1) * 5);
         EXPECT_EQ(node_value_arrs::TEMP_STORAGE_REG.size(), node_value_arrs::MAX_N_THREADS * (2 * 2 + 1));
-        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_ARR.size(), node_value_arrs::MAX_N_THREADS * (2 * 2 + 1) * 2);
-        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_REG.size(), node_value_arrs::MAX_N_THREADS * (2 * 2 + 1));
+        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_ARR.size(), 28);
+        EXPECT_EQ(node_value_arrs::TEMP_STORAGE_TEST_REG.size(), 14);
 
         node_value_arrs::initialize_d_matrix_arr();
         EXPECT_EQ(node_value_arrs::N_SELECTED, 0);
@@ -71,7 +71,7 @@ namespace {
 
         node_value_arrs::get_test_value_ptr(10, 141, 2, 0)[1] = 1.0;
         EXPECT_EQ(node_value_arrs::temp_storage_test_reg(10, 2, 0, false), 141);
-        EXPECT_EQ(node_value_arrs::access_temp_storage_test((10 % 2) + omp_get_thread_num() * (2 * 1 + 1))[1], 1.0);
+        EXPECT_EQ(node_value_arrs::access_temp_storage_test(node_value_arrs::get_op_test_slot(2, 0, false))[1], 1.0);
 
         node_value_arrs::get_d_matrix_ptr(1)[0] = 1.0;
         EXPECT_EQ(node_value_arrs::D_MATRIX[5], 1.0);