diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba62bf0..d46ccd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,9 @@ add_definitions(
     -DLEDGER_MINOR_VERSION=${MINOR_VERSION}
 )
 
+# Add flag to compile all Penumbra actions for cpp tests 
+add_definitions(-DFULL_APP)
+
 ##############################################################
 # Static Libraries
 file(GLOB_RECURSE LIB_SRC
diff --git a/app/src/plan/undelegate.c b/app/src/plan/undelegate.c
index 7679781..9eeb8ac 100644
--- a/app/src/plan/undelegate.c
+++ b/app/src/plan/undelegate.c
@@ -125,7 +125,7 @@ parser_error_t undelegate_printValue(const parser_context_t *ctx, const undelega
     written_value = strlen(outVal);
 
     // add unbonded amount
-    snprintf(metadata_buffer, sizeof(metadata_buffer), "uunbonding_start_at_%d_%s", undelegate->from_epoch.index,
+    snprintf(metadata_buffer, sizeof(metadata_buffer), "uunbonding_start_at_%llu_%s", undelegate->from_epoch.index,
              validator_identity_bytes);
     metadata.len = strlen(metadata_buffer);
     rs_get_asset_id_from_metadata(&metadata, asset_id_bytes, ASSET_ID_LEN);