diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
index 5972dfb20..ea87a3070 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
@@ -265,8 +265,8 @@ object SessionArtifacts {
     internal fun scrubAndMark(
         dir: File,
         stopWhenSessionStarts: Boolean = false,
-        sessionStarted: () -> Boolean = { SessionState.running },
         beforeReplace: (File) -> Unit = {},
+        sessionStarted: () -> Boolean = { SessionState.running },
     ): Boolean {
         val shouldStop = { stopWhenSessionStarts && sessionStarted() }
         val record = scrubTree(Record(dir), shouldStop, beforeReplace)
diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt
index a7cc5cf1a..197512e5b 100644
--- a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt
@@ -103,6 +103,7 @@ class GameEnvironmentStoreTest {
     }
 
     @Test fun logPreferenceUpdatesUseThePublisherLock() {
+        GameEnvironmentStore.publish(context)
         val entered = CountDownLatch(1)
         val finished = CountDownLatch(1)
         lateinit var thread: Thread
@@ -127,6 +128,7 @@ class GameEnvironmentStoreTest {
     @Test fun gameDebugLogsWaitForARetainedSessionFolder() {
         assertNull(SessionPaths.current())
         assertTrue(SessionPaths.currentSessionLogsRetained(context))
+        GameEnvironmentStore.publish(context)
         SessionPrefs.setLogsEnabled(context, false)
         val cacheSession = SessionPaths.beginOrCurrent(context, "game-debug-logs")
         try {