diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index 48a14dc33f613b0f0f3f73e986c9cb0a286ddbc0..df39bd69b024b2e56bd37d7e2f0e9f6e5c9b4241 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -52,7 +52,7 @@ program test_nearby_extr
 
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+  call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
        corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
        copy = 0, ishape_last = [ishape_last])
   CALL shpc_close(hshp)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index 6febf24a70eeb980308741ab782c523035822d51..a966d6627ba20d0cb1dfa6ddf6c354699183f52c 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -81,10 +81,10 @@ program test_overlap
   call read_column(ishape_last, file = trim(shpc_dir) // "/ishape_last.txt")
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(flow(1), hshp, nlon, nlat, d_init, k_test_1, corner, &
-       step, copy, ishape_last)
-  call read_snapshot(flow(max_delta + 1), hshp, nlon, nlat, d_init, k_test_2, &
+  call read_snapshot(flow(1), hshp, nlon, nlat, d_init, k_test_1 - d_init, &
        corner, step, copy, ishape_last)
+  call read_snapshot(flow(max_delta + 1), hshp, nlon, nlat, d_init, &
+       k_test_2 - d_init, corner, step, copy, ishape_last)
   CALL shpc_close(hshp)
   print *, "Enter flow(1)%list_vis%delta_out (array with ", &
        flow(1)%number_vis_extr, " values):"
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index d9016d8c9150d2535c7305cc58923039d587bf14..a3f277ede8c62292a68bb7ceaec2a8c45bad67ce 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -70,7 +70,7 @@ program test_read_snapshot
 
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+  call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
        corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
        copy = copy, ishape_last = [ishape_last])
   CALL shpc_close(hshp)
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 68f7d276390215688194f4ee64d6fae946796f5b..4dff6b169601aec24c04a9d833d95e04a39cef6d 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -102,19 +102,19 @@ program test_send_recv
   if (rank == 0) call dbf_read_attribute_03(d_init, hshp%extremum, &
        hshp%extr_date, ishape = 0)
   call ezmpi_bcast(d_init, root = 0)
-  if (rank == 1) call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+  if (rank == 1) call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
        corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
        copy = copy, ishape_last = ishape_last)
   CALL shpc_close(hshp)
 
   if (rank == 1) then
-     call send_snapshot(s, dest = 0, tag = d_init)
+     call send_snapshot(s, dest = 0, tag = 0)
   else
      ! rank == 0
      call MPI_Comm_get_attr(MPI_Comm_world, MPI_TAG_UB, attribute_val, flag)
      call assert(flag, "test_send_recv MPI_Comm_get_attr MPI_TAG_UB")
      print *, "MPI_TAG_UB = ", attribute_val
-     call recv_snapshot(s, nlon, nlat, copy, source = 1, tag = d_init)
+     call recv_snapshot(s, nlon, nlat, copy, source = 1, tag = 0)
      call write_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, d_init)
   end if