diff --git a/app/config.go b/app/config.go
index 3aae668605..8f50ff8b7b 100644
--- a/app/config.go
+++ b/app/config.go
@@ -20,7 +20,7 @@ var (
 	FlagBlockSizeValue          int
 	FlagLeanValue               bool
 	FlagCommitValue             bool
-	FlagOnOperationValue        bool
+	FlagOnOperationValue        bool // TODO: Remove in favor of binary search for invariant violation
 	FlagAllInvariantsValue      bool
 
 	FlagEnabledValue     bool
diff --git a/tests/simulation/sim_test.go b/tests/simulation/sim_test.go
index 3b313338f4..3fe882fe79 100644
--- a/tests/simulation/sim_test.go
+++ b/tests/simulation/sim_test.go
@@ -209,4 +209,8 @@ func TestFullAppSimulation(t *testing.T) {
 	}
 
 	simutils.PrintStats(db)
+
+	// Clean up resources
+	require.NoError(t, db.Close())
+	require.NoError(t, os.RemoveAll(dir))
 }