diff --git a/src/main/scala/vexriscv/plugin/BranchPlugin.scala b/src/main/scala/vexriscv/plugin/BranchPlugin.scala
index 2c38653..cffc530 100644
--- a/src/main/scala/vexriscv/plugin/BranchPlugin.scala
+++ b/src/main/scala/vexriscv/plugin/BranchPlugin.scala
@@ -218,7 +218,7 @@ class BranchPlugin(earlyBranch : Boolean,
         )
       )
 
-      insert(BRANCH_DO) := input(PREDICTION_HAD_BRANCHED) =/= insert(BRANCH_COND_RESULT)
+      insert(BRANCH_DO) := input(PREDICTION_HAD_BRANCHED) =/= input(BRANCH_COND_RESULT)
 
       //Calculation of the branch target / correction
       val imm = IMM(input(INSTRUCTION))
diff --git a/src/test/scala/vexriscv/Swing.scala b/src/main/scala/vexriscv/test/Swing.scala
similarity index 98%
rename from src/test/scala/vexriscv/Swing.scala
rename to src/main/scala/vexriscv/test/Swing.scala
index 261a79c..b3a1637 100644
--- a/src/test/scala/vexriscv/Swing.scala
+++ b/src/main/scala/vexriscv/test/Swing.scala
@@ -1,7 +1,7 @@
-package vexriscv
+package vexriscv.test
 
-import java.awt.{Color, Dimension, Graphics}
 import java.awt.event.{MouseEvent, MouseListener}
+import java.awt.{Color, Dimension, Graphics}
 import javax.swing.JPanel
 
 abstract class JLedArray(ledCount : Int,ledDiameter : Int = 20, blackThickness : Int = 2) extends JPanel{
diff --git a/src/test/scala/vexriscv/MuraxSim.scala b/src/test/scala/vexriscv/MuraxSim.scala
index bc80030..7d2c920 100644
--- a/src/test/scala/vexriscv/MuraxSim.scala
+++ b/src/test/scala/vexriscv/MuraxSim.scala
@@ -11,6 +11,7 @@ import javax.swing._
 
 import spinal.lib.com.jtag.sim.JtagTcp
 import spinal.lib.com.uart.sim.{UartDecoder, UartEncoder}
+import vexriscv.test.{JLedArray, JSwitchArray}
 
 import scala.collection.mutable