diff --git a/src/main/kotlin/at/ac/uibk/dps/cirrina/Runtime.kt b/src/main/kotlin/at/ac/uibk/dps/cirrina/Runtime.kt
index 378e38b1..a5326f7d 100644
--- a/src/main/kotlin/at/ac/uibk/dps/cirrina/Runtime.kt
+++ b/src/main/kotlin/at/ac/uibk/dps/cirrina/Runtime.kt
@@ -3,11 +3,7 @@ package at.ac.uibk.dps.cirrina
 import at.ac.uibk.dps.cirrina.cirrina.di.Main
 import at.ac.uibk.dps.cirrina.cirrina.di.Run
 import at.ac.uibk.dps.cirrina.execution.graph.EventGraph
-import at.ac.uibk.dps.cirrina.execution.`object`.Context
-import at.ac.uibk.dps.cirrina.execution.`object`.EventHandler
-import at.ac.uibk.dps.cirrina.execution.`object`.Extent
-import at.ac.uibk.dps.cirrina.execution.`object`.StateMachine
-import at.ac.uibk.dps.cirrina.execution.`object`.createHierarchy
+import at.ac.uibk.dps.cirrina.execution.`object`.*
 import at.ac.uibk.dps.cirrina.execution.service.RandomServiceImplementationSelector
 import at.ac.uibk.dps.cirrina.execution.service.ServiceImplementation
 import at.ac.uibk.dps.cirrina.execution.service.ServiceImplementationSelector
@@ -84,7 +80,7 @@ constructor(
     eventHandler.bind(
       graph = graph,
       instanceNames = run,
-      subscribedTo = instances.values.flatMap { it.subscriptions } /*.toSet()*/,
+      subscribedTo = instances.values.flatMap { it.subscriptions }.toSet(),
       handlers = instances.values.map { it::pushEvent },
     )
   }
diff --git a/src/test/resources/pkl/loop/main.pkl b/src/test/resources/pkl/loop/main.pkl
index 3e78e656..a834f504 100644
--- a/src/test/resources/pkl/loop/main.pkl
+++ b/src/test/resources/pkl/loop/main.pkl
@@ -31,7 +31,7 @@ collaborativeStateMachine {
         }
         ["b"] {
           entry {
-            new Eval { expression = "v =+ 1" }
+            new Eval { expression = "v += 1" }
           }
           always {
             new Transition { to = "a"; provided = "v < 1000" }
@@ -46,4 +46,4 @@ collaborativeStateMachine {
 instances {
   ["one"] { stateMachineName = "one" }
   ["two"] { stateMachineName = "two" }
-}
\ No newline at end of file
+}