diff --git a/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c b/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c
index da553d3db5886698cf39cb332987df24e7ce47ac..9e33bed61225e9eff2f277197bb58cb6c084ab57 100644
--- a/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c
+++ b/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c
@@ -274,7 +274,7 @@ int main(int argc, char** argv) {
    }
 
    /* check the results */
-   status = check_correctness_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/driver/legacy_interface/legacy_real_driver_c_version.c b/test/C/driver/legacy_interface/legacy_real_driver_c_version.c
index 448a54e9a4863601ee98cdd22ae85f44ee691c29..556d8896ab89b13b3fbe73c46965a12c8d93442b 100644
--- a/test/C/driver/legacy_interface/legacy_real_driver_c_version.c
+++ b/test/C/driver/legacy_interface/legacy_real_driver_c_version.c
@@ -278,7 +278,7 @@ int main(int argc, char** argv) {
 
 
    /* check the results */
-   status = check_correctness_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c b/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c
index 401a80cec2644626f16906053ed5a463df939e53..daed063a6ac7a66aa8d7cd46178bd5ad9417815f 100644
--- a/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c
+++ b/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c
@@ -274,7 +274,7 @@ int main(int argc, char** argv) {
    }
 
    /* check the results */
-   status = check_correctness_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c b/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c
index 97a5ea5778153a71686adcdc49261a2c25eb36cb..80cf1fa25b4c702309a62056f1530035caef4c40 100644
--- a/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c
+++ b/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c
@@ -277,7 +277,7 @@ int main(int argc, char** argv) {
    }
 
    /* check the results */
-   status = check_correctness_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c b/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c
index f07354a89437179d5a92463f91f1389fc5bc3bdc..79b3b3389421ca9e67a9648e4d2a12ee1ce093d0 100644
--- a/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c
+++ b/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c
@@ -241,9 +241,9 @@ int main(int argc, char** argv) {
 
    /* check the results */
 #ifdef DOUBLE_PRECISION_COMPLEX
-   status = check_correctness_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #else
-   status = check_correctness_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #endif
 
    if (status !=0){
diff --git a/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c b/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c
index fa818bd18fe2ea35144076081825b25c556251a2..71bb3d284872ec309e6fd5f24c568d47b8a6577e 100644
--- a/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c
+++ b/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c
@@ -233,9 +233,9 @@ int main(int argc, char** argv) {
 
 #ifdef DOUBLE_PRECISION_REAL
    /* check the results */
-   status = check_correctness_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #else
-   status = check_correctness_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #endif
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c b/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c
index 4d924a83f0b627124ff543a52ab72d641ceb65ff..05d11f0b6078d4d30d7054fd0fee565d61e83a02 100644
--- a/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c
+++ b/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c
@@ -236,9 +236,9 @@ int main(int argc, char** argv) {
 
    /* check the results */
 #ifdef DOUBLE_PRECISION_COMPLEX
-   status = check_correctness_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #else
-   status = check_correctness_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_complex_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #endif
    if (status !=0){
      printf("The computed EVs are not correct !\n");
diff --git a/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c b/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c
index 291fe41a5f9e306ef3fc2bb172cb6e439cd6add9..1aafc453aed4e74ac1ca8a9c10cd3b6d87d92369 100644
--- a/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c
+++ b/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c
@@ -230,9 +230,9 @@ int main(int argc, char** argv) {
 
    /* check the results */
 #ifdef DOUBLE_PRECISION_REAL
-   status = check_correctness_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_double_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #else
-   status = check_correctness_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
+   status = check_correctness_evp_numeric_residuals_real_single_f(na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid);
 #endif
 
    if (status !=0){
diff --git a/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90
index a4a4d150fd143c464c3689f4d38c2b6a276e3435..640399752702bf3a3d7bfb694bd8d4f6f9722bd8 100644
--- a/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90
+++ b/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90
@@ -323,7 +323,7 @@ program test_complex2
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/driver/legacy_interface/legacy_real_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_real_driver.F90
index d32751dfaf0a8066845193b52c459baa007f5e30..cdf5f151d5088f7760020f92535dd6bab1dce0ef 100644
--- a/test/Fortran/driver/legacy_interface/legacy_real_driver.F90
+++ b/test/Fortran/driver/legacy_interface/legacy_real_driver.F90
@@ -315,7 +315,7 @@ program test_real2
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90
index a802ef4f21da034664fba21ee964f53410d870df..2f6f43dc6951167d4a3781af3884d8714adab25e 100644
--- a/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90
+++ b/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90
@@ -323,7 +323,7 @@ program test_complex2
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90
index 0fe493901c20b5ce8de4a5629526d81f0298b26a..e9ce3e0c9cd821db63122e1f09844381e3b277b6 100644
--- a/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90
+++ b/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90
@@ -314,7 +314,7 @@ program test_real2
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex.F90
index bb077643816aeacb01cb496f352f5598bdc94746..fd0abdc4434ecdc64494735c65c2dc897aafe829 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_complex.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_complex.F90
@@ -271,7 +271,7 @@ program test_complex_double_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90
index adcf09f2d1d9b6bdc9338d2f0cf897216e886bff..9ebef56f6d3eb3f44572ef0c3aa3828d7974cc0c 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90
@@ -270,7 +270,7 @@ program test_complex_gpu_version_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real.F90
index 6946d3d63ac7ddff488817645b2a1b8eda421306..95c10539855329fcff961ffdd800db6f94a65390 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_real.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_real.F90
@@ -264,7 +264,7 @@ program test_real_double_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90
index 730c03c5a271c936c75f21d6e3109790e36a6fcf..b0988b57c5c71ae9c426c9a663a8f6717a5089f1 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90
@@ -264,7 +264,7 @@ program test_real_gpu_version_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90
index 323f743c373f924f95a03d0e5736c4fcb08b54af..31646d25b17db31ba2e89c0a6c711672ae97ce84 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90
@@ -270,7 +270,7 @@ program test_complex_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90
index 4c39d3aab95db887dffcac826a9064b15ca63cca..3fc4de6b85fc2bca1a1d57d1347f93f020d77d45 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90
@@ -270,7 +270,7 @@ program test_complex_gpu_version_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90
index 01c15082723c1a8411c189b49b1fa97514f56a4d..b58b696dabeacb5067bf49a4510fa604d1e64383 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90
@@ -263,7 +263,7 @@ program test_real_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90
index 85136857a711104bf419ba6f5a7ef6f6518d2fdc..eafc5ecf593fe99ad9b0cd2e622e68e00a711bcb 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90
@@ -264,7 +264,7 @@ program test_real_gpu_version_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_toeplitz.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_toeplitz.F90
index 6f4cb6a7e32ed5c0881e3e49cd23bf8fbbc48d24..1005d982c69577e081c6284f1a1562842ad15c93 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_single_toeplitz.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_single_toeplitz.F90
@@ -326,7 +326,7 @@ program test_solve_tridi_single
    endif
 
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, a, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, a, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa1/legacy_interface/legacy_toeplitz.F90 b/test/Fortran/elpa1/legacy_interface/legacy_toeplitz.F90
index 42c6092a6f569a4a93b3ec1e7923baa4df116ab7..ce13fd1173736230ec6a45c219b71df9c56357f7 100644
--- a/test/Fortran/elpa1/legacy_interface/legacy_toeplitz.F90
+++ b/test/Fortran/elpa1/legacy_interface/legacy_toeplitz.F90
@@ -327,7 +327,7 @@ program test_solve_tridi
    endif
 
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, a, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, a, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
 
diff --git a/test/Fortran/elpa2/complex_2stage_banded.F90 b/test/Fortran/elpa2/complex_2stage_banded.F90
index f6519a505c4259c02145182f0f6b437ddaaecb2a..13c9f961223f1a6ac878a1e7b08c395f828c4a72 100644
--- a/test/Fortran/elpa2/complex_2stage_banded.F90
+++ b/test/Fortran/elpa2/complex_2stage_banded.F90
@@ -253,7 +253,7 @@ program test_complex2_double_banded
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/double_instance.F90 b/test/Fortran/elpa2/double_instance.F90
index 863f57d42610ab4db21b226e2779c992052785b0..a21927f60f7de2e69ab139eee89604138a7b6a07 100644
--- a/test/Fortran/elpa2/double_instance.F90
+++ b/test/Fortran/elpa2/double_instance.F90
@@ -193,14 +193,14 @@ program test_interface
    call elpa_deallocate(e2)
    call elpa_uninit()
 
-   status = check_correctness(na, nev, as1, z1, ev1, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as1, z1, ev1, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a1)
    deallocate(as1)
    deallocate(z1)
    deallocate(ev1)
 
-   status = check_correctness(na, nev, as2, z2, ev2, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as2, z2, ev2, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a2)
    deallocate(as2)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex.F90
index 572bacbece25d5aeef042bb31862f42447ec7830..fbc5c747d8a8adc7b17ec98127ebd4d2cd9fe681 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_complex.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_complex.F90
@@ -265,7 +265,7 @@ program test_complex2_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90
index 8b180c63826812ccfc403647f9009b5bafe147bd..5bb7f0f8f9567d82301285d160cbd49b98c9ab40 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90
@@ -397,7 +397,7 @@ program test_complex2_choose_kernel_with_api_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90
index 3bf75f7d687a8c4da37b84030b854ae85079b6ac..c054b3e125ff8eeb71616443d5f50a91f9465c7d 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90
@@ -293,7 +293,7 @@ program test_complex2_default_kernel_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90
index 1c94105367202ca31f6e2ed819b0bbb31ff06707..2fc67523ef907bc7c3e9ec0b440d68dec9999a82 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90
@@ -292,7 +292,7 @@ program test_complex2_gpu_version_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real.F90
index eb51de5703244360e3a910327969b7c67d7565bf..f06bff4e984ead977354a75c2c032c58516de9b1 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_real.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_real.F90
@@ -270,7 +270,7 @@ program test_real2_double_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90
index 51f72c0f77a3d1ecf49467e11a9f453bd2f6abeb..b7c9d100c4e41840abeafda87d477855f02fee90 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90
@@ -432,7 +432,7 @@ program test_real2_choose_kernel_with_api_double_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90
index 77d478c4303afa331f0b81a9a4682e350df0fc72..da033fb48d9238907810bf22c23e8b4a4836a12d 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90
@@ -290,7 +290,7 @@ program test_real2_default_kernel_double_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90
index 15ccfc99a625d37c1c466df6777fa95c139ce692..7767473b9b7544043d4ff5605f5b62088797126a 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90
@@ -291,7 +291,7 @@ program test_real2_gpu_version_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90
index 9886a61bb5e95e53666279d27317fbfd39251cb9..5625736c9c661da57dad41f1d2f82cb7c2ff8128 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90
@@ -334,7 +334,7 @@ program test_real2_default_kernel_qr_decomposition_double_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   ret = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   ret = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90
index ced541a1298a278b8db66a32cacc9dbccff89f23..1c07973055e50ffdb28f458ee64f2cebcbd6e54c 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90
@@ -264,7 +264,7 @@ program test_complex2_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90
index bf89908dc977216a26f72f3a5fa856f7419495bd..9e15fce82337038cd7d22f80597da29d3ac9ce00 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90
@@ -397,7 +397,7 @@ program test_complex2_choose_kernel_with_api_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90
index a3f192ffb05327adf679084edb0c6b7591b52ed5..5c8e95ae191a531afb7cf33ddb7435856a4ce76c 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90
@@ -290,7 +290,7 @@ program test_complex2_default_kernel_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90
index 48f39c17f004b8add30f32be4a60e3904a39e78a..6b97c986ab92ecc5cbe242b00bfdffd37da91e05 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90
@@ -289,7 +289,7 @@ program test_complex2_gpu_version_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90
index 93aa47e2992a89c5df0d9eae65efb5972bcebc23..ada13b31c5be30c4c9dceb83e8e6024defdbf195 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90
@@ -269,7 +269,7 @@ program test_real2_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90
index ad36b110c3bc0da6d36d06d55392874b946422c3..2facbde610e99b903c00d7a839382d8064eb4335 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90
@@ -428,7 +428,7 @@ program test_real2_choose_kernel_with_api_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90
index cd5692b0a7fb9187bf511beaef773423b522ef0a..98f9d03c4b51c65c9aca54fe9aa56473cca54993 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90
@@ -289,7 +289,7 @@ program test_real2_default_kernel_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90
index 5b2e5797ba257d503805b119fd94218e850da361..3e64222ce6bacbfef2e61cba911ed0c87866e067 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90
@@ -292,7 +292,7 @@ program test_real2_gpu_version_single_precision
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90
index 8934f75c3dfa34c6a3be7d213f82d3c2571ca5d8..2739097f5a28692d716ef9fa6ca511468439a5b1 100644
--- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90
+++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90
@@ -338,7 +338,7 @@ program test_real2_default_kernel_qr_decomposition_single_precision
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   ret = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   ret = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/real_2stage_banded.F90 b/test/Fortran/elpa2/real_2stage_banded.F90
index 9593e3c36e339be8ca20bf2ae6708f241be34ef0..a72d6b885bb00d4ef204fe6a8eae2020689ed5ae 100644
--- a/test/Fortran/elpa2/real_2stage_banded.F90
+++ b/test/Fortran/elpa2/real_2stage_banded.F90
@@ -250,7 +250,7 @@ program test_real2_double_banded
    ! Test correctness of result (using plain scalapack routines)
 
    
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
 
    deallocate(a)
diff --git a/test/Fortran/elpa2/single_complex_2stage_banded.F90 b/test/Fortran/elpa2/single_complex_2stage_banded.F90
index 9a1e1e59c7854058e66d48398428e4d8f89f6136..b9913a6209a53623bc6869d10a6834bed8916cf8 100644
--- a/test/Fortran/elpa2/single_complex_2stage_banded.F90
+++ b/test/Fortran/elpa2/single_complex_2stage_banded.F90
@@ -252,7 +252,7 @@ program test_complex2_single_banded
 
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
 
    deallocate(a)
    deallocate(as)
diff --git a/test/Fortran/elpa2/single_real_2stage_banded.F90 b/test/Fortran/elpa2/single_real_2stage_banded.F90
index d09ec67ad3c9a4c65dc7ee70bd4af9dc2ac74e41..7b4b2ff22bd55c68597e5c401f50447a1fdc6d7e 100644
--- a/test/Fortran/elpa2/single_real_2stage_banded.F90
+++ b/test/Fortran/elpa2/single_real_2stage_banded.F90
@@ -248,7 +248,7 @@ program test_real2_single_banded
    !-------------------------------------------------------------------------------
    ! Test correctness of result (using plain scalapack routines)
 
-   status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+   status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
    deallocate(a)
    deallocate(as)
 
diff --git a/test/Fortran/elpa_tests.F90 b/test/Fortran/elpa_tests.F90
index 3bb432adb37a1af97fc0716222f1fecf2774d987..ed6616f73f3c837f92e6d61325b3f03dc42a70b4 100644
--- a/test/Fortran/elpa_tests.F90
+++ b/test/Fortran/elpa_tests.F90
@@ -1013,10 +1013,10 @@ program test_all_real
 
 
      if (input_options%datatype .eq. 1) then
-       status = check_correctness(na, nev, as_real, z_real, ev, sc_desc, myid)
+       status = check_correctness_evp_numeric_residuals(na, nev, as_real, z_real, ev, sc_desc, myid)
      endif
      if (input_options%datatype .eq. 2) then
-       status = check_correctness(na, nev, as_complex, z_complex, ev, sc_desc, myid)
+       status = check_correctness_evp_numeric_residuals(na, nev, as_complex, z_complex, ev, sc_desc, myid)
      endif
 
      if (status .eq. 1) then
@@ -1099,7 +1099,7 @@ program test_all_real
                         elpa_int_value_to_string("real_kernel", ELPA_2STAGE_REAL_DEFAULT),' default kernel:',tEnd - tStart
          if (myid == 0) print *," "
 
-         status = check_correctness(na, nev, as_real, z_real, ev, sc_desc, myid)
+         status = check_correctness_evp_numeric_residuals(na, nev, as_real, z_real, ev, sc_desc, myid)
          if (myid == 0) print *," "
 
          if (status .eq. 1) then
@@ -1189,7 +1189,7 @@ program test_all_real
                             trim(elpa_real_kernel_name(this_kernel)),' kernel:',tEnd - tStart
              if (myid == 0) print *," "
 
-             status = check_correctness(na, nev, as_real, z_real, ev, sc_desc, myid)
+             status = check_correctness_evp_numeric_residuals(na, nev, as_real, z_real, ev, sc_desc, myid)
              if (myid == 0) print *," "
 
              if (status .eq. 1) then
@@ -1283,7 +1283,7 @@ program test_all_real
                           trim(elpa_real_kernel_name(input_options%this_real_kernel)),' kernel:',tEnd - tStart
            if (myid == 0) print *," "
 
-           status = check_correctness(na, nev, as_real, z_real, ev, sc_desc, myid)
+           status = check_correctness_evp_numeric_residuals(na, nev, as_real, z_real, ev, sc_desc, myid)
            if (myid == 0) print *," "
 
            if (status .eq. 1) then
@@ -1380,7 +1380,7 @@ program test_all_real
                         elpa_int_value_to_string("complex_kernel", ELPA_2STAGE_COMPLEX_DEFAULT),' default kernel:',tEnd - tStart
          if (myid == 0) print *," "
 
-         status = check_correctness(na, nev, as_complex, z_complex, ev, sc_desc, myid)
+         status = check_correctness_evp_numeric_residuals(na, nev, as_complex, z_complex, ev, sc_desc, myid)
          if (myid == 0) print *," "
 
          if (status .eq. 1) then
@@ -1471,7 +1471,7 @@ program test_all_real
                               trim(elpa_complex_kernel_name(this_kernel)),' kernel:',tEnd - tStart
              if (myid == 0) print *," "
 
-             status = check_correctness(na, nev, as_complex, z_complex, ev, sc_desc, myid)
+             status = check_correctness_evp_numeric_residuals(na, nev, as_complex, z_complex, ev, sc_desc, myid)
              if (myid == 0) print *," "
 
              if (status .eq. 1) then
@@ -1568,7 +1568,7 @@ program test_all_real
                           trim(elpa_complex_kernel_name(input_options%this_complex_kernel)),' kernel:',tEnd - tStart
            if (myid == 0) print *," "
 
-           status = check_correctness(na, nev, as_complex, z_complex, ev, sc_desc, myid)
+           status = check_correctness_evp_numeric_residuals(na, nev, as_complex, z_complex, ev, sc_desc, myid)
            if (myid == 0) print *," "
 
            if (status .eq. 1) then
diff --git a/test/Fortran/test.F90 b/test/Fortran/test.F90
index 8486e9b5929716b2b7dd43587b50ccdc27142c87..4c5cafda808ca03a4eede71bd57f5bd8bcf77a68 100644
--- a/test/Fortran/test.F90
+++ b/test/Fortran/test.F90
@@ -503,8 +503,11 @@ program test
 #ifdef TEST_MATRIX_ANALYTIC
      status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, check_all_evals)
 #else
+!#elif defined(TEST_MATRIX_FRANK)
+!     status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol)
+!#elif defined(TEST_MATRIX_RANDOM)
      if (nev .ge. 1) then
-       status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol)
+       status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol)
      else
        ! zero eigenvectors and no analytic test => toeplitz
        status = check_correctness_eigenvalues_toeplitz(na, diagonalElement, &
@@ -521,7 +524,7 @@ program test
 
 #ifdef TEST_SOLVE_TRIDIAGONAL
      ! check eigenvectors
-     status = check_correctness(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
+     status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows, np_cols, my_prow, my_pcol)
      call check_status(status, myid)
 #endif
 #endif
diff --git a/test/shared/test_check_correctness.F90 b/test/shared/test_check_correctness.F90
index 20d8e870e16642f837d7f67333a0cf85b53a05a0..1d812b9edc3359ff29d2c892f272a010e599c28f 100644
--- a/test/shared/test_check_correctness.F90
+++ b/test/shared/test_check_correctness.F90
@@ -45,14 +45,14 @@
 module test_check_correctness
   use test_util
 
-  interface check_correctness
-    module procedure check_correctness_complex_double
-    module procedure check_correctness_real_double
+  interface check_correctness_evp_numeric_residuals
+    module procedure check_correctness_evp_numeric_residuals_complex_double
+    module procedure check_correctness_evp_numeric_residuals_real_double
 #ifdef WANT_SINGLE_PRECISION_REAL
-    module procedure check_correctness_real_single
+    module procedure check_correctness_evp_numeric_residuals_real_single
 #endif
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
-    module procedure check_correctness_complex_single
+    module procedure check_correctness_evp_numeric_residuals_complex_single
 #endif
   end interface
 
diff --git a/test/shared/test_check_correctness_template.F90 b/test/shared/test_check_correctness_template.F90
index 82db1aa17327845a73312dd9c09978b66243ae95..eb79a52f2cbd3ea311dc7c11ef422b82c67edea6 100644
--- a/test/shared/test_check_correctness_template.F90
+++ b/test/shared/test_check_correctness_template.F90
@@ -41,7 +41,7 @@
 !
 ! Author: A. Marek, MPCDF
 
-    function check_correctness_&
+    function check_correctness_evp_numeric_residuals_&
     &MATH_DATATYPE&
     &_&
     &PRECISION&
@@ -323,11 +323,11 @@
 #if REALCASE == 1
 
 #ifdef DOUBLE_PRECISION_REAL
-    !c> int check_correctness_real_double_f(int na, int nev, int na_rows, int na_cols,
+    !c> int check_correctness_evp_numeric_residuals_real_double_f(int na, int nev, int na_rows, int na_cols,
     !c>                                         double *as, double *z, double *ev,
     !c>                                         int sc_desc[9], int myid);
 #else
-    !c> int check_correctness_real_single_f(int na, int nev, int na_rows, int na_cols,
+    !c> int check_correctness_evp_numeric_residuals_real_single_f(int na, int nev, int na_rows, int na_cols,
     !c>                                         float *as, float *z, float *ev,
     !c>                                         int sc_desc[9], int myid);
 #endif
@@ -336,22 +336,22 @@
 
 #if COMPLEXCASE == 1
 #ifdef DOUBLE_PRECISION_COMPLEX
-    !c> int check_correctness_complex_double_f(int na, int nev, int na_rows, int na_cols,
+    !c> int check_correctness_evp_numeric_residuals_complex_double_f(int na, int nev, int na_rows, int na_cols,
     !c>                                         complex double *as, complex double *z, double *ev,
     !c>                                         int sc_desc[9], int myid);
 #else
-    !c> int check_correctness_complex_single_f(int na, int nev, int na_rows, int na_cols,
+    !c> int check_correctness_evp_numeric_residuals_complex_single_f(int na, int nev, int na_rows, int na_cols,
     !c>                                         complex float *as, complex float *z, float *ev,
     !c>                                         int sc_desc[9], int myid);
 #endif
 #endif /* COMPLEXCASE */
 
-function check_correctness_&
+function check_correctness_evp_numeric_residuals_&
 &MATH_DATATYPE&
 &_&
 &PRECISION&
 &_f (na, nev, na_rows, na_cols, as, z, ev, sc_desc, myid) result(status) &
-      bind(C,name="check_correctness_&
+      bind(C,name="check_correctness_evp_numeric_residuals_&
       &MATH_DATATYPE&
       &_&
       &PRECISION&
@@ -371,7 +371,7 @@ function check_correctness_&
       ! TODO: I did not want to add all the variables to the C interface as well
       ! TODO: I think that we should find a better way to pass this information
       ! TODO: to all the functions anyway (get it from sc_desc, pass elpa_t, etc..)
-      status = check_correctness_&
+      status = check_correctness_evp_numeric_residuals_&
       &MATH_DATATYPE&
       &_&
       &PRECISION&