diff --git a/src/pEpEngine.c b/src/pEpEngine.c
index 24c6ff77..e5d8f00d 100644
--- a/src/pEpEngine.c
+++ b/src/pEpEngine.c
@@ -6,6 +6,7 @@
 #include "cryptotech.h"
 #include "transport.h"
 #include "blacklist.h"
+#include "KeySync_fsm.h"
 
 #include <time.h>
 #include <stdlib.h>
@@ -3189,6 +3190,8 @@ DYNAMIC_API PEP_STATUS generate_keypair(
     if (identity->fpr)
         status = set_pgp_keypair(session, identity->fpr);
 
+    signal_Sync_event(session, Sync_PR_keysync, KeyGen);
+
     // add to known keypair DB, as this might not end up being a default
     return status;
 }
diff --git a/sync/gen_statemachine.ysl2 b/sync/gen_statemachine.ysl2
index d9e95af9..cd568396 100644
--- a/sync/gen_statemachine.ysl2
+++ b/sync/gen_statemachine.ysl2
@@ -178,7 +178,7 @@ tstylesheet {
                     int event
                 );
 
-            PEP_STATUS inject_«@name»_event(
+            PEP_STATUS signal_«@name»_event(
                     PEP_SESSION session, 
                     «@name»_PR fsm,
                     int event
@@ -226,7 +226,7 @@ tstylesheet {
                 return PEP_STATUS_OK;
             }
 
-            PEP_STATUS inject_«@name»_event(
+            PEP_STATUS signal_«@name»_event(
                     PEP_SESSION session, 
                     «@name»_PR fsm,
                     int event
diff --git a/test/src/EngineTestSuite.cc b/test/src/EngineTestSuite.cc
index 2849b058..423da0a6 100644
--- a/test/src/EngineTestSuite.cc
+++ b/test/src/EngineTestSuite.cc
@@ -48,7 +48,7 @@ void EngineTestSuite::set_full_env() {
         struct stat buf;
 
         if (stat(test_home.c_str(), &buf) == 0) {
-            cout << test_home << " exists. We'll recursively delete. We hope we're not horking your whole system..." << endl;
+            cout << test_home << " exists. Deleting..." << endl;
             int success = nftw((test_home + "/.").c_str(), util_delete_filepath, 100, FTW_DEPTH);
         }
     }
diff --git a/test/src/engine_tests/SyncTests.cc b/test/src/engine_tests/SyncTests.cc
index 481f3e39..23ef93ff 100644
--- a/test/src/engine_tests/SyncTests.cc
+++ b/test/src/engine_tests/SyncTests.cc
@@ -35,6 +35,8 @@ public:
 
     static int inject_sync_event(SYNC_EVENT ev, void *management)
     {
+        Sync_event_t *_ev = ev;
+        cout << "injecting event " << _ev->event << "\n";
         auto adapter = static_cast< Sync_Adapter *>(management);
         adapter->q.push_front(ev);
         return 0;