diff --git a/tests/longevity/riferimento/riferimento.json b/tests/longevity/riferimento/riferimento.json
index dcad11a..6838996 100644
--- a/tests/longevity/riferimento/riferimento.json
+++ b/tests/longevity/riferimento/riferimento.json
@@ -998,6 +998,15 @@
    ],
    "atteso": 20
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    0,
+    2,
+    6
+   ],
+   "atteso": 20
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1007,6 +1016,15 @@
    ],
    "atteso": 30.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    0.5,
+    2,
+    6
+   ],
+   "atteso": 20
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1016,6 +1034,15 @@
    ],
    "atteso": 40.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    1.0,
+    2,
+    6
+   ],
+   "atteso": 20
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1025,6 +1052,15 @@
    ],
    "atteso": 50.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    1.5,
+    2,
+    6
+   ],
+   "atteso": 20
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1034,6 +1070,15 @@
    ],
    "atteso": 60.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    2.0,
+    2,
+    6
+   ],
+   "atteso": 20
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1043,6 +1088,15 @@
    ],
    "atteso": 70.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    2.5,
+    2,
+    6
+   ],
+   "atteso": 30.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1052,6 +1106,15 @@
    ],
    "atteso": 80.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    3.0,
+    2,
+    6
+   ],
+   "atteso": 40.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1061,6 +1124,15 @@
    ],
    "atteso": 90.0
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    3.5,
+    2,
+    6
+   ],
+   "atteso": 50.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1070,6 +1142,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    4.0,
+    2,
+    6
+   ],
+   "atteso": 60.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1079,6 +1160,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    4.5,
+    2,
+    6
+   ],
+   "atteso": 70.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1088,6 +1178,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    5.0,
+    2,
+    6
+   ],
+   "atteso": 80.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1097,6 +1196,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    5.5,
+    2,
+    6
+   ],
+   "atteso": 90.0
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1106,6 +1214,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    6.0,
+    2,
+    6
+   ],
+   "atteso": 100
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1115,6 +1232,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    6.5,
+    2,
+    6
+   ],
+   "atteso": 100
+  },
   {
    "fn": "score_increasing_plateau",
    "args": [
@@ -1124,6 +1250,15 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_increasing_plateau",
+   "args": [
+    7.0,
+    2,
+    6
+   ],
+   "atteso": 100
+  },
   {
    "fn": "score_fat_percent",
    "args": [
@@ -13856,6 +13991,346 @@
    ],
    "atteso": 40.75000000000001
   },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    10,
+    130,
+    40,
+    24
+   ],
+   "atteso": 57.140000000000015
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    12.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 49.690000000000005
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.0,
+    130,
+    40,
+    24
+   ],
+   "atteso": 42.24
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    17.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 34.79000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    20.0,
+    130,
+    40,
+    24
+   ],
+   "atteso": 27.339999999999996
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    22.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 19.890000000000008
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    25.0,
+    130,
+    40,
+    24
+   ],
+   "atteso": 12.440000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    100,
+    40,
+    24
+   ],
+   "atteso": 44.050000000000004
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    110,
+    40,
+    24
+   ],
+   "atteso": 42.95
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    120,
+    40,
+    24
+   ],
+   "atteso": 41.85
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 40.75000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    140,
+    40,
+    24
+   ],
+   "atteso": 39.650000000000006
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    150,
+    40,
+    24
+   ],
+   "atteso": 38.550000000000004
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    160,
+    40,
+    24
+   ],
+   "atteso": 37.45
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    20,
+    24
+   ],
+   "atteso": 43.55000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    25,
+    24
+   ],
+   "atteso": 42.85000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    30,
+    24
+   ],
+   "atteso": 42.150000000000006
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    35,
+    24
+   ],
+   "atteso": 41.45000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 40.75000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    45,
+    24
+   ],
+   "atteso": 40.05000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    50,
+    24
+   ],
+   "atteso": 39.35000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    55,
+    24
+   ],
+   "atteso": 38.650000000000006
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    60,
+    24
+   ],
+   "atteso": 37.95000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    65,
+    24
+   ],
+   "atteso": 37.25000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    70,
+    24
+   ],
+   "atteso": 36.55000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    75,
+    24
+   ],
+   "atteso": 35.85000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    18
+   ],
+   "atteso": 43.09
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    20
+   ],
+   "atteso": 42.31
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    22
+   ],
+   "atteso": 41.53000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    24
+   ],
+   "atteso": 40.75000000000001
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    26
+   ],
+   "atteso": 39.970000000000006
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    28
+   ],
+   "atteso": 39.190000000000005
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    30
+   ],
+   "atteso": 38.410000000000004
+  },
+  {
+   "fn": "vo2max_from_2km_walk",
+   "args": [
+    15.5,
+    130,
+    40,
+    32
+   ],
+   "atteso": 37.63000000000001
+  },
   {
    "fn": "score_handgrip",
    "args": [
@@ -19808,6 +20283,46 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_plank",
+   "args": [
+    79,
+    "M"
+   ],
+   "atteso": 20
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    97,
+    "M"
+   ],
+   "atteso": 40
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    122,
+    "M"
+   ],
+   "atteso": 55
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    157,
+    "M"
+   ],
+   "atteso": 75
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    201,
+    "M"
+   ],
+   "atteso": 90
+  },
   {
    "fn": "score_flexed_arm_hang",
    "args": [
@@ -29301,6 +29816,46 @@
    ],
    "atteso": 100
   },
+  {
+   "fn": "score_plank",
+   "args": [
+    35,
+    "F"
+   ],
+   "atteso": 20
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    63,
+    "F"
+   ],
+   "atteso": 40
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    84,
+    "F"
+   ],
+   "atteso": 55
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    108,
+    "F"
+   ],
+   "atteso": 75
+  },
+  {
+   "fn": "score_plank",
+   "args": [
+    142,
+    "F"
+   ],
+   "atteso": 90
+  },
   {
    "fn": "score_flexed_arm_hang",
    "args": [