diff --git a/deps/evalhyd-cpp b/deps/evalhyd-cpp
index a8c62cd26901feb3ff1d745a24569a3814d0f023..805e4a6af9271dec04e55417d7539b7c09841f40 160000
--- a/deps/evalhyd-cpp
+++ b/deps/evalhyd-cpp
@@ -1 +1 @@
-Subproject commit a8c62cd26901feb3ff1d745a24569a3814d0f023
+Subproject commit 805e4a6af9271dec04e55417d7539b7c09841f40
diff --git a/tests/testthat/expected/evalp/AWI.csv b/tests/testthat/expected/evalp/AWI.csv
deleted file mode 100644
index 8b3b7e7f9598b23911dc06f440d71572b99b48e5..0000000000000000000000000000000000000000
--- a/tests/testthat/expected/evalp/AWI.csv
+++ /dev/null
@@ -1 +0,0 @@
-0.9821120161733,0.9880951944476
diff --git a/tests/testthat/expected/evalp/WSS.csv b/tests/testthat/expected/evalp/WSS.csv
deleted file mode 100644
index fd929dabd8f58354be587455dcbd4402d6a9f83d..0000000000000000000000000000000000000000
--- a/tests/testthat/expected/evalp/WSS.csv
+++ /dev/null
@@ -1 +0,0 @@
-0.6621887740287,0.4360388849930
diff --git a/tests/testthat/test-probabilist-bootstrapping.R b/tests/testthat/test-probabilist-bootstrapping.R
index 8198deb539e89e6c71d43754339d5a37d2daf99f..013b3654286657a4b145ed5f62a433e2f0b46a7c 100644
--- a/tests/testthat/test-probabilist-bootstrapping.R
+++ b/tests/testthat/test-probabilist-bootstrapping.R
@@ -17,7 +17,7 @@ all_metrics = c(
 # 'RANK_HIST', 'DS', 'AS',
 # ------------------------------------------------------------------------------
   # intervals
-  'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS',
+  'CR', 'AW', 'AWN', 'WS',
   # multivariate
   'ES'
 )
diff --git a/tests/testthat/test-probabilist-missing-data.R b/tests/testthat/test-probabilist-missing-data.R
index 19c6fb99a046a4e21bcada4aba2d3b689ed2fe76..75ce237d81ea7b5590ef6f570d870f8687e2b2f4 100644
--- a/tests/testthat/test-probabilist-missing-data.R
+++ b/tests/testthat/test-probabilist-missing-data.R
@@ -40,7 +40,7 @@ metrics = c("BS", "BSS", "BS_CRD", "BS_LBD", "REL_DIAG", "CRPS_FROM_BS",
             "CRPS_FROM_ECDF",
             "QS", "CRPS_FROM_QS",
             "POD", "POFD", "FAR", "CSI", "ROCSS",
-            "CR", "AW", "AWN", "AWI", "WS", "WSS",
+            "CR", "AW", "AWN", "WS",
             "ES")
 
 for (metric in metrics)
diff --git a/tests/testthat/test-probabilist-multi-dimensional.R b/tests/testthat/test-probabilist-multi-dimensional.R
index d600090b0237fa4b080d483584c020b946613fac..b0115790b91713ae15696c64c283fa95ef36333c 100644
--- a/tests/testthat/test-probabilist-multi-dimensional.R
+++ b/tests/testthat/test-probabilist-multi-dimensional.R
@@ -17,7 +17,7 @@ all_metrics = c(
 # 'RANK_HIST', 'DS', 'AS',
 # ------------------------------------------------------------------------------
   # intervals
-  'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS'
+  'CR', 'AW', 'AWN', 'WS'
 )
 
 # load some predicted and observed streamflow
diff --git a/tests/testthat/test-probabilist.R b/tests/testthat/test-probabilist.R
index 3298c6f07cfe6722ef3e4378a5374558ac7ce5a4..81b1a29cb1db4f71d5ad47e1ac17a540eeda346b 100644
--- a/tests/testthat/test-probabilist.R
+++ b/tests/testthat/test-probabilist.R
@@ -274,23 +274,11 @@ exp = list(
     ),
     dim=c(1,1,1,1,2)
   ),
-  AWI = array(
-    data=unlist(
-      read.csv("./expected/evalp/AWI.csv", header=FALSE, colClasses="numeric")
-    ),
-    dim=c(1,1,1,1,2)
-  ),
   WS = array(
     data=unlist(
       read.csv("./expected/evalp/WS.csv", header=FALSE, colClasses="numeric")
     ),
     dim=c(1,1,1,1,2)
-  ),
-  WSS = array(
-    data=unlist(
-      read.csv("./expected/evalp/WSS.csv", header=FALSE, colClasses="numeric")
-    ),
-    dim=c(1,1,1,1,2)
   )
 )