diff --git a/tests/simple_archiver.c b/tests/simple_archiver.c
index 1bf74c66d8330495b876358186c10691e265f87f..85c24ada8e1355ca775da8c0094511f50de9afa8 100644
--- a/tests/simple_archiver.c
+++ b/tests/simple_archiver.c
@@ -144,24 +144,43 @@ CHEAT_TEST(simple_archiver,
                  mstro_pool_event tmp=e;
                  /* handle all */
                  while(tmp) {
+                   const char *event_name=NULL;
+                   const char *cdo_name=NULL;
+                   event_name = mstro_pool_event_description(tmp->kind);
+                   
                    switch(tmp->kind) {
                      case MSTRO_POOL_EVENT_OFFER:
                        /* FIXME: Immediately post a REQUIRE for it */
-                       fprintf(stderr, "Spotted an OFFER for CDO (`%s`)\n", e->offer.cdo_name);
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
 
                      case MSTRO_POOL_EVENT_DECLARE:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_DISPOSE:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_SEAL:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_DEMAND:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_REQUIRE:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_RETRACT:
+                       cdo_name = tmp->offer.cdo_name;
+                       break;
                      case MSTRO_POOL_EVENT_WITHDRAW:
-                       fprintf(stdout, "CDO event %s\n",
-                               mstro_pool_event_description(tmp->kind));
+                       cdo_name = tmp->offer.cdo_name;
                        break;
                      default:
                        fprintf(stderr, "Unexpected CDO event %d\n", tmp->kind);
                    }
+                   fprintf(stdout, "CDO event %s for CDO |%s|\n",
+                           event_name, cdo_name ? cdo_name : "??");
+
                    tmp=tmp->next;
                  }
                  /* acknowledge all */