diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index c8c9024..2212b0c 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -3,11 +3,12 @@ services:
     image: "bootstrap"
     build:
       dockerfile_inline: |
-        FROM spack/ubuntu-jammy:0.22.2
+        FROM spack/ubuntu-jammy:0.23
         VOLUME /configs
         ARG OMPI_VERSION
         ENV OMPI_VERSION=$${OMPI_VERSION}
         CMD cp /configs/spack.yaml . && \
+            export OMPI_VERSION=$( [[ "$${OMPI_VERSION}" == git.* ]] && echo "$${OMPI_VERSION}=main" || echo "$${OMPI_VERSION}" ) && \
             spack -e . add openmpi@$${OMPI_VERSION} && \
             spack -e . containerize >/configs/spack.Dockerfile
       args:
@@ -36,8 +37,8 @@ services:
             cmake /fenix \
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_C_COMPILER=mpicc \
-                -DFENIX_EXAMPLES=ON \
-                -DFENIX_TESTS=ON \
+                -DBUILD_EXAMPLES=ON \
+                -DBUILD_TESTING=ON \
                 -DMPIEXEC_PREFLAGS="--allow-run-as-root;--map-by;:oversubscribe" && \
             make -j
         
diff --git a/.github/workflows/ci_checks.yaml b/.github/workflows/ci_checks.yaml
index c6adc31..a11ed54 100644
--- a/.github/workflows/ci_checks.yaml
+++ b/.github/workflows/ci_checks.yaml
@@ -12,6 +12,9 @@ jobs:
         ompi_version:
           - main
           - 5.0.3
+          - git.v5.0.5
+          - git.v5.0.7
+          - git.v5.0.x
 
     steps:
       - name: Checkout
@@ -37,4 +40,4 @@ jobs:
             *.args.OMPI_VERSION=${{ matrix.ompi_version }}
 
       - name: Test Fenix
-        run: docker run fenix
+        run: docker run fenix ctest --output-on-failure --timeout 20 --repeat after-timeout:3
diff --git a/examples/01_hello_world/fenix/run.batch b/examples/01_hello_world/fenix/run.batch
deleted file mode 100755
index a8a55ff..0000000
--- a/examples/01_hello_world/fenix/run.batch
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=fenix_hello_world                
-#SBATCH --output=fenix_hello_world.out
-#SBATCH --error=fenix_hello_world.err
-#SBATCH --nodes=2               
-#SBATCH --ntasks-per-node=4
-#SBATCH --time=00:20:00
-
-/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./fenix_hello_world 2
diff --git a/examples/01_hello_world/mpi/run.batch b/examples/01_hello_world/mpi/run.batch
deleted file mode 100755
index dc390cf..0000000
--- a/examples/01_hello_world/mpi/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=mpi_hello_world                
-#SBATCH --output=mpi_hello_world.out
-#SBATCH --error=mpi_hello_world.err
-#SBATCH --nodes=8                
-#SBATCH --time=00:15:00
-
-/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_hello_world 7
diff --git a/examples/02_send_recv/fenix/run.batch b/examples/02_send_recv/fenix/run.batch
deleted file mode 100644
index a50fd7a..0000000
--- a/examples/02_send_recv/fenix/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=fenix_ring                
-#SBATCH --output=fenix_ring.out
-#SBATCH --error=fenix_ring.err
-#SBATCH --nodes=2                
-#SBATCH --time=00:02:00
-
-/home/knteran/mpi-ulfm-0416/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./fenix_ring 2 --verbose 73
diff --git a/examples/02_send_recv/mpi/run.batch b/examples/02_send_recv/mpi/run.batch
deleted file mode 100755
index 734f2d5..0000000
--- a/examples/02_send_recv/mpi/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=mpi_ring                
-#SBATCH --output=mpi_ring.out
-#SBATCH --error=mpi_ring.err
-#SBATCH --nodes=8                
-#SBATCH --time=00:15:00
-
-/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_ring 7
diff --git a/examples/03_reduce/fenix/run.batch b/examples/03_reduce/fenix/run.batch
deleted file mode 100755
index 2b7b710..0000000
--- a/examples/03_reduce/fenix/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=fenix_reduce                
-#SBATCH --output=fenix_reduce.out
-#SBATCH --error=fenix_reduce.err
-#SBATCH --nodes=8                
-#SBATCH --time=00:15:00
-
-/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../fenix_reduce 7
diff --git a/examples/03_reduce/mpi/run.batch b/examples/03_reduce/mpi/run.batch
deleted file mode 100755
index bec8b25..0000000
--- a/examples/03_reduce/mpi/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=mpi                
-#SBATCH --output=mpi.out
-#SBATCH --error=mpi.err
-#SBATCH --nodes=8                
-#SBATCH --time=00:15:00
-
-/home/knteran/mpi-ulfm-05022016/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --pernode -n 8 ../mpi_reduce 7
diff --git a/examples/05_subset_create/run.batch b/examples/05_subset_create/run.batch
deleted file mode 100644
index da3952c..0000000
--- a/examples/05_subset_create/run.batch
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#SBATCH --job-name=fenix_subset_create                
-#SBATCH --output=fenix_subset_create.out
-#SBATCH --error=fenix_subet_create.err
-#SBATCH --nodes=2                
-#SBATCH --time=00:02:00
-
-/home/knteran/mpi-ulfm-0416/bin/mpirun --mca pml ob1 -am ft-enable-mpi --mca btl openib,sm,self --npernode 4 -n 8 ./subset_create 2
diff --git a/include/fenix.h b/include/fenix.h
index d9c5c6c..7a68f82 100644
--- a/include/fenix.h
+++ b/include/fenix.h
@@ -547,8 +547,8 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
 
 //!@unimplemented As #Fenix_Data_member_restore, but restores from a specific rank's data.
 int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *data,
-                                        int max_count, int time_stamp, int group_id,
-                                        int source_rank);
+                                        int max_count, int time_stamp,
+                                        Fenix_Data_subset* found_data, int source_rank);
 
 /**
  * @brief Create a data subset for use in store operations.
diff --git a/src/fenix.c b/src/fenix.c
index b5b2c6e..056814a 100644
--- a/src/fenix.c
+++ b/src/fenix.c
@@ -138,7 +138,7 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
     return __fenix_member_lrestore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
 }
 
-int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, int source_rank) {
+int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, Fenix_Data_subset* data_found, int source_rank) {
     return 0;
 }
 
diff --git a/src/fenix_data_recovery.c b/src/fenix_data_recovery.c
index 314df0b..0fba896 100644
--- a/src/fenix_data_recovery.c
+++ b/src/fenix_data_recovery.c
@@ -920,8 +920,8 @@ int __fenix_member_set_attribute(int groupid, int memberid, int attributename,
 
         if( myerr ) {
           debug_print(
-                  "ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; invalid attribute_value <%d>\n",
-                  attributevalue);
+                  "ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; error %d\n", myerr
+          );
           retval = FENIX_ERROR_INVALID_ATTRIBUTE_NAME;
         }