diff --git a/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala b/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
index d1279f2260e..3a9c01311c0 100644
--- a/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
+++ b/src/test/scala-2/chiselTests/experimental/OpaqueTypeSpec.scala
@@ -115,12 +115,12 @@ object OpaqueTypeSpec {
   class Boxed[T <: Data](gen: T) extends MaybeBoxed[T] {
     def boxed = true
     lazy val elements = SeqMap("underlying" -> gen)
-    def underlying = elements.head._2
+    def underlying = elements.head._2.asInstanceOf[T]
   }
   class Unboxed[T <: Data](gen: T) extends MaybeBoxed[T] with OpaqueType {
     def boxed = false
     lazy val elements = SeqMap("" -> gen)
-    def underlying = elements.head._2
+    def underlying = elements.head._2.asInstanceOf[T]
   }
 
   class MaybeNoAsUInt(noAsUInt: Boolean) extends Record with OpaqueType {
diff --git a/src/test/scala-2/chiselTests/interface/Drivers.scala b/src/test/scala-2/chiselTests/interface/Drivers.scala
index 138b8aca04b..44682db1691 100644
--- a/src/test/scala-2/chiselTests/interface/Drivers.scala
+++ b/src/test/scala-2/chiselTests/interface/Drivers.scala
@@ -5,7 +5,7 @@ import java.io.File
 import chisel3.RawModule
 import chisel3.stage.ChiselGeneratorAnnotation
 import circt.stage.{ChiselStage, FirtoolOption}
-import firrtl.AnnotationSeq
+import firrtl.{seqToAnnoSeq, AnnotationSeq}
 import firrtl.options.{StageError, StageUtils}
 import sys.process._
 
diff --git a/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala b/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
index f4f0d78e66f..04f7041a0f2 100644
--- a/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
+++ b/src/test/scala-2/chiselTests/simulator/SimulatorSpec.scala
@@ -7,7 +7,7 @@ import chisel3.simulator._
 import chisel3.util.{HasExtModuleInline, HasExtModulePath, HasExtModuleResource}
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.must.Matchers
-import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper
+// import org.scalatest.matchers.should.Matchers.convertToStringShouldWrapperForVerb
 import svsim._
 
 class VerilatorSimulator(val workspacePath: String) extends Simulator[verilator.Backend] {
diff --git a/src/test/scala-2/circtTests/stage/ChiselStageSpec.scala b/src/test/scala-2/chiselTests/stage/ChiselStageSpec.scala
similarity index 99%
rename from src/test/scala-2/circtTests/stage/ChiselStageSpec.scala
rename to src/test/scala-2/chiselTests/stage/ChiselStageSpec.scala
index d4c11b88454..df7e690cf9b 100644
--- a/src/test/scala-2/circtTests/stage/ChiselStageSpec.scala
+++ b/src/test/scala-2/chiselTests/stage/ChiselStageSpec.scala
@@ -123,12 +123,12 @@ object ChiselStageSpec {
   }
 
   class RecoverableErrorFakeSourceInfo extends RawModule {
-    implicit val info = SourceLine("Foo", 3, 10)
+    implicit val info: SourceLine = SourceLine("Foo", 3, 10)
     3.U >> -1
   }
 
   class ErrorCaughtByFirtool extends RawModule {
-    implicit val info = SourceLine("Foo", 3, 10)
+    implicit val info: SourceLine = SourceLine("Foo", 3, 10)
     val w = Wire(UInt(8.W))
   }
 
diff --git a/src/test/scala-2/chisel3/PlaceholderSpec.scala b/src/test/scala/chisel3/PlaceholderSpec.scala
similarity index 100%
rename from src/test/scala-2/chisel3/PlaceholderSpec.scala
rename to src/test/scala/chisel3/PlaceholderSpec.scala
diff --git a/src/test/scala-2/chisel3/internal/ContainsProbeSpec.scala b/src/test/scala/chisel3/internal/ContainsProbeSpec.scala
similarity index 100%
rename from src/test/scala-2/chisel3/internal/ContainsProbeSpec.scala
rename to src/test/scala/chisel3/internal/ContainsProbeSpec.scala
diff --git a/src/test/scala-2/chisel3/internal/NameCollisionSpec.scala b/src/test/scala/chisel3/internal/NameCollisionSpec.scala
similarity index 100%
rename from src/test/scala-2/chisel3/internal/NameCollisionSpec.scala
rename to src/test/scala/chisel3/internal/NameCollisionSpec.scala
diff --git a/src/test/scala-2/chisel3/internal/NamespaceSpec.scala b/src/test/scala/chisel3/internal/NamespaceSpec.scala
similarity index 100%
rename from src/test/scala-2/chisel3/internal/NamespaceSpec.scala
rename to src/test/scala/chisel3/internal/NamespaceSpec.scala
diff --git a/src/test/scala-2/chisel3/stage/ChiselOptionsViewSpec.scala b/src/test/scala/chisel3/stage/ChiselOptionsViewSpec.scala
similarity index 96%
rename from src/test/scala-2/chisel3/stage/ChiselOptionsViewSpec.scala
rename to src/test/scala/chisel3/stage/ChiselOptionsViewSpec.scala
index 73c34e291fc..0145adfaea1 100644
--- a/src/test/scala-2/chisel3/stage/ChiselOptionsViewSpec.scala
+++ b/src/test/scala/chisel3/stage/ChiselOptionsViewSpec.scala
@@ -3,7 +3,7 @@
 package chisel3.stage
 
 import firrtl.options.Viewer.view
-import firrtl.RenameMap
+import firrtl.{seqToAnnoSeq, RenameMap}
 
 import chisel3.ElaboratedCircuit
 import chisel3.stage._
diff --git a/src/test/scala-2/chisel3/testers/TestUtils.scala b/src/test/scala/chisel3/testers/TestUtils.scala
similarity index 100%
rename from src/test/scala-2/chisel3/testers/TestUtils.scala
rename to src/test/scala/chisel3/testers/TestUtils.scala
diff --git a/src/test/scala-2/chisel3/util/experimental/decode/TruthTableSpec.scala b/src/test/scala/chisel3/util/experimental/decode/TruthTableSpec.scala
similarity index 100%
rename from src/test/scala-2/chisel3/util/experimental/decode/TruthTableSpec.scala
rename to src/test/scala/chisel3/util/experimental/decode/TruthTableSpec.scala
diff --git a/src/test/scala-2/chiselTests/AdderTree.scala b/src/test/scala/chiselTests/AdderTree.scala
similarity index 97%
rename from src/test/scala-2/chiselTests/AdderTree.scala
rename to src/test/scala/chiselTests/AdderTree.scala
index 9c5b4b5f3f6..5ba178458bb 100644
--- a/src/test/scala-2/chiselTests/AdderTree.scala
+++ b/src/test/scala/chiselTests/AdderTree.scala
@@ -20,7 +20,7 @@ class AdderTreeTester(bitWidth: Int, numsToAdd: List[Int]) extends Module {
   val dut = Module(new AdderTree(genType, numsToAdd.size))
   dut.io.numIn := VecInit(numsToAdd.map(x => x.asUInt(bitWidth.W)))
   val sumCorrect = dut.io.numOut === (numsToAdd.reduce(_ + _) % (1 << bitWidth)).asUInt(bitWidth.W)
-  assert(sumCorrect)
+  chisel3.assert(sumCorrect)
   stop()
 }
 
diff --git a/src/test/scala-2/chiselTests/AnalogIntegrationSpec.scala b/src/test/scala/chiselTests/AnalogIntegrationSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AnalogIntegrationSpec.scala
rename to src/test/scala/chiselTests/AnalogIntegrationSpec.scala
diff --git a/src/test/scala-2/chiselTests/AnalogSpec.scala b/src/test/scala/chiselTests/AnalogSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AnalogSpec.scala
rename to src/test/scala/chiselTests/AnalogSpec.scala
diff --git a/src/test/scala-2/chiselTests/AnnotatingDiamondSpec.scala b/src/test/scala/chiselTests/AnnotatingDiamondSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AnnotatingDiamondSpec.scala
rename to src/test/scala/chiselTests/AnnotatingDiamondSpec.scala
diff --git a/src/test/scala-2/chiselTests/AnnotationInlineSpec.scala b/src/test/scala/chiselTests/AnnotationInlineSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AnnotationInlineSpec.scala
rename to src/test/scala/chiselTests/AnnotationInlineSpec.scala
diff --git a/src/test/scala-2/chiselTests/AnnotationNoDedup.scala b/src/test/scala/chiselTests/AnnotationNoDedup.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AnnotationNoDedup.scala
rename to src/test/scala/chiselTests/AnnotationNoDedup.scala
diff --git a/src/test/scala-2/chiselTests/Assert.scala b/src/test/scala/chiselTests/Assert.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Assert.scala
rename to src/test/scala/chiselTests/Assert.scala
diff --git a/src/test/scala-2/chiselTests/AsyncResetSpec.scala b/src/test/scala/chiselTests/AsyncResetSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/AsyncResetSpec.scala
rename to src/test/scala/chiselTests/AsyncResetSpec.scala
diff --git a/src/test/scala-2/chiselTests/AutoClonetypeSpec.scala b/src/test/scala/chiselTests/AutoClonetypeSpec.scala
similarity index 99%
rename from src/test/scala-2/chiselTests/AutoClonetypeSpec.scala
rename to src/test/scala/chiselTests/AutoClonetypeSpec.scala
index 42f008fa65d..6411430c878 100644
--- a/src/test/scala-2/chiselTests/AutoClonetypeSpec.scala
+++ b/src/test/scala/chiselTests/AutoClonetypeSpec.scala
@@ -344,7 +344,7 @@ class AutoClonetypeSpec extends AnyFlatSpec with Matchers {
     }
     emitCHIRRTL {
       new Module {
-        implicit val x = 8
+        implicit val x: Int = 8
         val in = IO(Input(new MyBundle))
         val out = IO(Output(new MyBundle))
         out := in
diff --git a/src/test/scala-2/chiselTests/BetterNamingTests.scala b/src/test/scala/chiselTests/BetterNamingTests.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/BetterNamingTests.scala
rename to src/test/scala/chiselTests/BetterNamingTests.scala
diff --git a/src/test/scala-2/chiselTests/BitwiseOps.scala b/src/test/scala/chiselTests/BitwiseOps.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/BitwiseOps.scala
rename to src/test/scala/chiselTests/BitwiseOps.scala
diff --git a/src/test/scala-2/chiselTests/BlackBox.scala b/src/test/scala/chiselTests/BlackBox.scala
similarity index 98%
rename from src/test/scala-2/chiselTests/BlackBox.scala
rename to src/test/scala/chiselTests/BlackBox.scala
index 38886dd9852..946552f93ae 100644
--- a/src/test/scala-2/chiselTests/BlackBox.scala
+++ b/src/test/scala/chiselTests/BlackBox.scala
@@ -361,7 +361,7 @@ class BlackBoxSpec extends AnyFlatSpec with Matchers with ChiselSim with FileChe
     object A extends layer.Layer(layer.LayerConfig.Extract())
 
     sealed trait NoIo { this: BlackBox =>
-      final val io = IO(new Bundle {})
+      final val io = chisel3.IO(new Bundle {})
     }
 
     // No known layers
@@ -401,7 +401,7 @@ class BlackBoxSpec extends AnyFlatSpec with Matchers with ChiselSim with FileChe
     class Bar extends BlackBox {
       final val io = IO {
         new Bundle {
-          val a = Output(probe.Probe(Bool(), layers.Verification))
+          val a = Output(probe.Probe(Bool(), chisel3.layers.Verification))
         }
       }
     }
@@ -411,7 +411,7 @@ class BlackBoxSpec extends AnyFlatSpec with Matchers with ChiselSim with FileChe
     class Baz extends BlackBox(knownLayers = Seq(A)) {
       final val io = IO {
         new Bundle {
-          val a = Output(probe.Probe(Bool(), layers.Verification))
+          val a = Output(probe.Probe(Bool(), chisel3.layers.Verification))
         }
       }
     }
diff --git a/src/test/scala-2/chiselTests/BlackBoxImpl.scala b/src/test/scala/chiselTests/BlackBoxImpl.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/BlackBoxImpl.scala
rename to src/test/scala/chiselTests/BlackBoxImpl.scala
diff --git a/src/test/scala-2/chiselTests/BoolSpec.scala b/src/test/scala/chiselTests/BoolSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/BoolSpec.scala
rename to src/test/scala/chiselTests/BoolSpec.scala
diff --git a/src/test/scala-2/chiselTests/BulkConnectSpec.scala b/src/test/scala/chiselTests/BulkConnectSpec.scala
similarity index 98%
rename from src/test/scala-2/chiselTests/BulkConnectSpec.scala
rename to src/test/scala/chiselTests/BulkConnectSpec.scala
index adbd49217e0..fc4d7da11c7 100644
--- a/src/test/scala-2/chiselTests/BulkConnectSpec.scala
+++ b/src/test/scala/chiselTests/BulkConnectSpec.scala
@@ -73,7 +73,7 @@ class BulkConnectSpec extends AnyPropSpec with Matchers {
     val chirrtl = ChiselStage.emitCHIRRTL(new Module {
       val io: MyBundle = IO(Flipped(new MyBundle))
 
-      val bb = Module(new BlackBox {
+      val bb = Module[BlackBox { def io: MyBundle }](new BlackBox {
         val io: MyBundle = IO(Flipped(new MyBundle))
       })
 
diff --git a/src/test/scala-2/chiselTests/BundleWire.scala b/src/test/scala/chiselTests/BundleWire.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/BundleWire.scala
rename to src/test/scala/chiselTests/BundleWire.scala
diff --git a/src/test/scala-2/chiselTests/ChiselTestUtilitiesSpec.scala b/src/test/scala/chiselTests/ChiselTestUtilitiesSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ChiselTestUtilitiesSpec.scala
rename to src/test/scala/chiselTests/ChiselTestUtilitiesSpec.scala
diff --git a/src/test/scala-2/chiselTests/ClockSpec.scala b/src/test/scala/chiselTests/ClockSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ClockSpec.scala
rename to src/test/scala/chiselTests/ClockSpec.scala
diff --git a/src/test/scala-2/chiselTests/ConnectSpec.scala b/src/test/scala/chiselTests/ConnectSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ConnectSpec.scala
rename to src/test/scala/chiselTests/ConnectSpec.scala
diff --git a/src/test/scala-2/chiselTests/ConstSpec.scala b/src/test/scala/chiselTests/ConstSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ConstSpec.scala
rename to src/test/scala/chiselTests/ConstSpec.scala
diff --git a/src/test/scala-2/chiselTests/Counter.scala b/src/test/scala/chiselTests/Counter.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Counter.scala
rename to src/test/scala/chiselTests/Counter.scala
diff --git a/src/test/scala-2/chiselTests/CustomBundle.scala b/src/test/scala/chiselTests/CustomBundle.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/CustomBundle.scala
rename to src/test/scala/chiselTests/CustomBundle.scala
diff --git a/src/test/scala-2/chiselTests/Decoder.scala b/src/test/scala/chiselTests/Decoder.scala
similarity index 95%
rename from src/test/scala-2/chiselTests/Decoder.scala
rename to src/test/scala/chiselTests/Decoder.scala
index 48870cc9851..95ed8d27805 100644
--- a/src/test/scala-2/chiselTests/Decoder.scala
+++ b/src/test/scala/chiselTests/Decoder.scala
@@ -14,7 +14,7 @@ class Decoder(bitpats: List[String]) extends Module {
     val inst = Input(UInt(32.W))
     val matched = Output(Bool())
   })
-  io.matched := VecInit(bitpats.map(BitPat(_) === io.inst)).reduce(_ || _)
+  io.matched := VecInit(bitpats.map(BitPat(_) === io.inst).reduce(_ || _))
 }
 
 class DecoderTester(pairs: List[(String, String)]) extends Module {
diff --git a/src/test/scala-2/chiselTests/DecoupledSpec.scala b/src/test/scala/chiselTests/DecoupledSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/DecoupledSpec.scala
rename to src/test/scala/chiselTests/DecoupledSpec.scala
diff --git a/src/test/scala-2/chiselTests/DedupSpec.scala b/src/test/scala/chiselTests/DedupSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/DedupSpec.scala
rename to src/test/scala/chiselTests/DedupSpec.scala
diff --git a/src/test/scala-2/chiselTests/DisableSpec.scala b/src/test/scala/chiselTests/DisableSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/DisableSpec.scala
rename to src/test/scala/chiselTests/DisableSpec.scala
diff --git a/src/test/scala-2/chiselTests/DontTouchSpec.scala b/src/test/scala/chiselTests/DontTouchSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/DontTouchSpec.scala
rename to src/test/scala/chiselTests/DontTouchSpec.scala
diff --git a/src/test/scala-2/chiselTests/EnableShiftRegister.scala b/src/test/scala/chiselTests/EnableShiftRegister.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/EnableShiftRegister.scala
rename to src/test/scala/chiselTests/EnableShiftRegister.scala
diff --git a/src/test/scala-2/chiselTests/EnumSpec.scala b/src/test/scala/chiselTests/EnumSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/EnumSpec.scala
rename to src/test/scala/chiselTests/EnumSpec.scala
diff --git a/src/test/scala-2/chiselTests/ExtModule.scala b/src/test/scala/chiselTests/ExtModule.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ExtModule.scala
rename to src/test/scala/chiselTests/ExtModule.scala
diff --git a/src/test/scala-2/chiselTests/ExtModuleImpl.scala b/src/test/scala/chiselTests/ExtModuleImpl.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ExtModuleImpl.scala
rename to src/test/scala/chiselTests/ExtModuleImpl.scala
diff --git a/src/test/scala-2/chiselTests/GCD.scala b/src/test/scala/chiselTests/GCD.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/GCD.scala
rename to src/test/scala/chiselTests/GCD.scala
diff --git a/src/test/scala-2/chiselTests/IOCompatibility.scala b/src/test/scala/chiselTests/IOCompatibility.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/IOCompatibility.scala
rename to src/test/scala/chiselTests/IOCompatibility.scala
diff --git a/src/test/scala-2/chiselTests/IllegalRefSpec.scala b/src/test/scala/chiselTests/IllegalRefSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/IllegalRefSpec.scala
rename to src/test/scala/chiselTests/IllegalRefSpec.scala
diff --git a/src/test/scala-2/chiselTests/ImplicitConversionsSpec.scala b/src/test/scala/chiselTests/ImplicitConversionsSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ImplicitConversionsSpec.scala
rename to src/test/scala/chiselTests/ImplicitConversionsSpec.scala
diff --git a/src/test/scala-2/chiselTests/InlineSpec.scala b/src/test/scala/chiselTests/InlineSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/InlineSpec.scala
rename to src/test/scala/chiselTests/InlineSpec.scala
diff --git a/src/test/scala-2/chiselTests/IntegerMathSpec.scala b/src/test/scala/chiselTests/IntegerMathSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/IntegerMathSpec.scala
rename to src/test/scala/chiselTests/IntegerMathSpec.scala
diff --git a/src/test/scala-2/chiselTests/IntrinsicModule.scala b/src/test/scala/chiselTests/IntrinsicModule.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/IntrinsicModule.scala
rename to src/test/scala/chiselTests/IntrinsicModule.scala
diff --git a/src/test/scala-2/chiselTests/IntrinsicSpec.scala b/src/test/scala/chiselTests/IntrinsicSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/IntrinsicSpec.scala
rename to src/test/scala/chiselTests/IntrinsicSpec.scala
index 172679e3ffa..61c50cb7b26 100644
--- a/src/test/scala-2/chiselTests/IntrinsicSpec.scala
+++ b/src/test/scala/chiselTests/IntrinsicSpec.scala
@@ -4,6 +4,7 @@ package chiselTests
 
 import chisel3._
 import circt.stage.ChiselStage
+import chisel3.experimental.{fromIntToIntParam, fromStringToStringParam}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
diff --git a/src/test/scala-2/chiselTests/InvalidateAPISpec.scala b/src/test/scala/chiselTests/InvalidateAPISpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/InvalidateAPISpec.scala
rename to src/test/scala/chiselTests/InvalidateAPISpec.scala
diff --git a/src/test/scala-2/chiselTests/LazyCloneSpec.scala b/src/test/scala/chiselTests/LazyCloneSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/LazyCloneSpec.scala
rename to src/test/scala/chiselTests/LazyCloneSpec.scala
diff --git a/src/test/scala-2/chiselTests/LiteralExtractorSpec.scala b/src/test/scala/chiselTests/LiteralExtractorSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/LiteralExtractorSpec.scala
rename to src/test/scala/chiselTests/LiteralExtractorSpec.scala
diff --git a/src/test/scala-2/chiselTests/LiteralToTargetSpec.scala b/src/test/scala/chiselTests/LiteralToTargetSpec.scala
similarity index 78%
rename from src/test/scala-2/chiselTests/LiteralToTargetSpec.scala
rename to src/test/scala/chiselTests/LiteralToTargetSpec.scala
index d27270bdda0..9c65450a059 100644
--- a/src/test/scala-2/chiselTests/LiteralToTargetSpec.scala
+++ b/src/test/scala/chiselTests/LiteralToTargetSpec.scala
@@ -8,11 +8,8 @@ import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers
 
 class LiteralToTargetSpec extends AnyFreeSpec with Matchers {
-
   "Literal Data should fail to be converted to ReferenceTarget" in {
-
-    (the[ChiselException] thrownBy {
-
+    val ex = the[ChiselException] thrownBy {
       class Bar extends RawModule {
         val a = 1.U
       }
@@ -23,6 +20,8 @@ class LiteralToTargetSpec extends AnyFreeSpec with Matchers {
       }
 
       ChiselStage.emitCHIRRTL(new Foo)
-    } should have).message("Illegal component name: UInt<1>(0h1) (note: literals are illegal)")
+    }
+
+    ex.getMessage shouldBe "Illegal component name: UInt<1>(0h1) (note: literals are illegal)"
   }
 }
diff --git a/src/test/scala-2/chiselTests/LoadMemoryFromFileSpec.scala b/src/test/scala/chiselTests/LoadMemoryFromFileSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/LoadMemoryFromFileSpec.scala
rename to src/test/scala/chiselTests/LoadMemoryFromFileSpec.scala
diff --git a/src/test/scala-2/chiselTests/LogUtils.scala b/src/test/scala/chiselTests/LogUtils.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/LogUtils.scala
rename to src/test/scala/chiselTests/LogUtils.scala
index 9d0eb86cfc7..e87f475c1ae 100644
--- a/src/test/scala-2/chiselTests/LogUtils.scala
+++ b/src/test/scala/chiselTests/LogUtils.scala
@@ -4,6 +4,7 @@ package chiselTests
 
 import java.io.{ByteArrayOutputStream, PrintStream}
 import logger.{LogLevel, LogLevelAnnotation, Logger}
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 
 trait LogUtils {
 
diff --git a/src/test/scala-2/chiselTests/Math.scala b/src/test/scala/chiselTests/Math.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Math.scala
rename to src/test/scala/chiselTests/Math.scala
diff --git a/src/test/scala-2/chiselTests/MemorySearch.scala b/src/test/scala/chiselTests/MemorySearch.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/MemorySearch.scala
rename to src/test/scala/chiselTests/MemorySearch.scala
diff --git a/src/test/scala-2/chiselTests/MixedVecSpec.scala b/src/test/scala/chiselTests/MixedVecSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/MixedVecSpec.scala
rename to src/test/scala/chiselTests/MixedVecSpec.scala
diff --git a/src/test/scala-2/chiselTests/ModuleChoiceSpec.scala b/src/test/scala/chiselTests/ModuleChoiceSpec.scala
similarity index 97%
rename from src/test/scala-2/chiselTests/ModuleChoiceSpec.scala
rename to src/test/scala/chiselTests/ModuleChoiceSpec.scala
index 438c91c4ac5..08db700f33f 100644
--- a/src/test/scala-2/chiselTests/ModuleChoiceSpec.scala
+++ b/src/test/scala/chiselTests/ModuleChoiceSpec.scala
@@ -34,8 +34,8 @@ class ModuleWithChoice[T <: Data](
   default: => FixedIOBaseModule[T]
 )(alternateImpls: Seq[(Case, () => FixedIOBaseModule[T])])
     extends Module {
-  val inst = ModuleChoice(default)(alternateImpls)
-  val io = IO(inst.cloneType)
+  val inst: T = ModuleChoice[T](default, alternateImpls)
+  val io:   T = IO(chiselTypeOf(inst))
   io <> inst
 }
 
diff --git a/src/test/scala-2/chiselTests/ModuleSpec.scala b/src/test/scala/chiselTests/ModuleSpec.scala
similarity index 99%
rename from src/test/scala-2/chiselTests/ModuleSpec.scala
rename to src/test/scala/chiselTests/ModuleSpec.scala
index 79de51146c5..a88d0dcfa71 100644
--- a/src/test/scala-2/chiselTests/ModuleSpec.scala
+++ b/src/test/scala/chiselTests/ModuleSpec.scala
@@ -9,6 +9,7 @@ import chisel3.stage.ChiselGeneratorAnnotation
 import circt.stage.{CIRCTTarget, CIRCTTargetAnnotation, ChiselStage, FirtoolOption}
 import firrtl.annotations.NoTargetAnnotation
 import firrtl.options.{TargetDirAnnotation, Unserializable}
+import firrtl.{annoSeqToSeq, seqToAnnoSeq}
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 import scala.io.Source
diff --git a/src/test/scala-2/chiselTests/MulLookup.scala b/src/test/scala/chiselTests/MulLookup.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/MulLookup.scala
rename to src/test/scala/chiselTests/MulLookup.scala
diff --git a/src/test/scala-2/chiselTests/MultiAssign.scala b/src/test/scala/chiselTests/MultiAssign.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/MultiAssign.scala
rename to src/test/scala/chiselTests/MultiAssign.scala
diff --git a/src/test/scala-2/chiselTests/MultiClockSpec.scala b/src/test/scala/chiselTests/MultiClockSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/MultiClockSpec.scala
rename to src/test/scala/chiselTests/MultiClockSpec.scala
diff --git a/src/test/scala-2/chiselTests/NamedModuleTester.scala b/src/test/scala/chiselTests/NamedModuleTester.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/NamedModuleTester.scala
rename to src/test/scala/chiselTests/NamedModuleTester.scala
diff --git a/src/test/scala-2/chiselTests/OneHotMuxSpec.scala b/src/test/scala/chiselTests/OneHotMuxSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/OneHotMuxSpec.scala
rename to src/test/scala/chiselTests/OneHotMuxSpec.scala
diff --git a/src/test/scala-2/chiselTests/OptionBundle.scala b/src/test/scala/chiselTests/OptionBundle.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/OptionBundle.scala
rename to src/test/scala/chiselTests/OptionBundle.scala
diff --git a/src/test/scala-2/chiselTests/Padding.scala b/src/test/scala/chiselTests/Padding.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Padding.scala
rename to src/test/scala/chiselTests/Padding.scala
diff --git a/src/test/scala-2/chiselTests/ParameterizedModule.scala b/src/test/scala/chiselTests/ParameterizedModule.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ParameterizedModule.scala
rename to src/test/scala/chiselTests/ParameterizedModule.scala
diff --git a/src/test/scala-2/chiselTests/PopCount.scala b/src/test/scala/chiselTests/PopCount.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/PopCount.scala
rename to src/test/scala/chiselTests/PopCount.scala
diff --git a/src/test/scala-2/chiselTests/PortSpec.scala b/src/test/scala/chiselTests/PortSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/PortSpec.scala
rename to src/test/scala/chiselTests/PortSpec.scala
diff --git a/src/test/scala-2/chiselTests/PrintableSpec.scala b/src/test/scala/chiselTests/PrintableSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/PrintableSpec.scala
rename to src/test/scala/chiselTests/PrintableSpec.scala
diff --git a/src/test/scala-2/chiselTests/Printf.scala b/src/test/scala/chiselTests/Printf.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Printf.scala
rename to src/test/scala/chiselTests/Printf.scala
diff --git a/src/test/scala-2/chiselTests/PropertyUtils.scala b/src/test/scala/chiselTests/PropertyUtils.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/PropertyUtils.scala
rename to src/test/scala/chiselTests/PropertyUtils.scala
diff --git a/src/test/scala-2/chiselTests/ReadOnlySpec.scala b/src/test/scala/chiselTests/ReadOnlySpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ReadOnlySpec.scala
rename to src/test/scala/chiselTests/ReadOnlySpec.scala
diff --git a/src/test/scala-2/chiselTests/RebindingSpec.scala b/src/test/scala/chiselTests/RebindingSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/RebindingSpec.scala
rename to src/test/scala/chiselTests/RebindingSpec.scala
diff --git a/src/test/scala-2/chiselTests/RecordSpec.scala b/src/test/scala/chiselTests/RecordSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/RecordSpec.scala
rename to src/test/scala/chiselTests/RecordSpec.scala
diff --git a/src/test/scala-2/chiselTests/ReduceTreeSpec.scala b/src/test/scala/chiselTests/ReduceTreeSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ReduceTreeSpec.scala
rename to src/test/scala/chiselTests/ReduceTreeSpec.scala
diff --git a/src/test/scala-2/chiselTests/RegSpec.scala b/src/test/scala/chiselTests/RegSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/RegSpec.scala
rename to src/test/scala/chiselTests/RegSpec.scala
diff --git a/src/test/scala-2/chiselTests/ResetSpec.scala b/src/test/scala/chiselTests/ResetSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ResetSpec.scala
rename to src/test/scala/chiselTests/ResetSpec.scala
diff --git a/src/test/scala-2/chiselTests/Risc.scala b/src/test/scala/chiselTests/Risc.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Risc.scala
rename to src/test/scala/chiselTests/Risc.scala
diff --git a/src/test/scala-2/chiselTests/SIntOps.scala b/src/test/scala/chiselTests/SIntOps.scala
similarity index 98%
rename from src/test/scala-2/chiselTests/SIntOps.scala
rename to src/test/scala/chiselTests/SIntOps.scala
index 02144d9fb3f..9997ed104c0 100644
--- a/src/test/scala-2/chiselTests/SIntOps.scala
+++ b/src/test/scala/chiselTests/SIntOps.scala
@@ -202,13 +202,13 @@ class SIntOpsSpec extends AnyPropSpec with Matchers with ShiftRightWidthBehavior
   }
 
   property("Static right-shift should have a minimum width of 1") {
-    testShiftRightWidthBehavior(SInt)(chiselMinWidth = 1, firrtlMinWidth = 1)
+    testSIntShiftRightWidthBehavior(chiselMinWidth = 1, firrtlMinWidth = 1)
   }
 
   property("Static right-shift should have width of 0 in Chisel and 1 in FIRRTL with --use-legacy-width") {
     val args = Array("--use-legacy-width")
 
-    testShiftRightWidthBehavior(SInt)(chiselMinWidth = 0, firrtlMinWidth = 1, args = args)
+    testSIntShiftRightWidthBehavior(chiselMinWidth = 0, firrtlMinWidth = 1, args = args)
 
     // Focused test to show the mismatch
     class TestModule extends Module {
diff --git a/src/test/scala-2/chiselTests/SimLogSpec.scala b/src/test/scala/chiselTests/SimLogSpec.scala
similarity index 99%
rename from src/test/scala-2/chiselTests/SimLogSpec.scala
rename to src/test/scala/chiselTests/SimLogSpec.scala
index d3c6aa6745d..b6424cdd2ed 100644
--- a/src/test/scala-2/chiselTests/SimLogSpec.scala
+++ b/src/test/scala/chiselTests/SimLogSpec.scala
@@ -33,7 +33,7 @@ class SimLogSpec extends AnyFlatSpec with Matchers with FileCheck with ChiselSim
     class MyModule extends Module {
       val in = IO(Input(UInt(8.W)))
       val fd = SimLog.file("logfile.log")
-      fd.printf("in = %d\n", in)
+      // fd.printf("in = %d\n", in)
     }
     ChiselStage
       .emitCHIRRTL(new MyModule)
diff --git a/src/test/scala-2/chiselTests/SourceLocatorSpec.scala b/src/test/scala/chiselTests/SourceLocatorSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/SourceLocatorSpec.scala
rename to src/test/scala/chiselTests/SourceLocatorSpec.scala
diff --git a/src/test/scala-2/chiselTests/Stack.scala b/src/test/scala/chiselTests/Stack.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Stack.scala
rename to src/test/scala/chiselTests/Stack.scala
diff --git a/src/test/scala-2/chiselTests/Stop.scala b/src/test/scala/chiselTests/Stop.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Stop.scala
rename to src/test/scala/chiselTests/Stop.scala
diff --git a/src/test/scala-2/chiselTests/SwitchSpec.scala b/src/test/scala/chiselTests/SwitchSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/SwitchSpec.scala
rename to src/test/scala/chiselTests/SwitchSpec.scala
diff --git a/src/test/scala-2/chiselTests/Tbl.scala b/src/test/scala/chiselTests/Tbl.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Tbl.scala
rename to src/test/scala/chiselTests/Tbl.scala
diff --git a/src/test/scala-2/chiselTests/TypeAliasSpec.scala b/src/test/scala/chiselTests/TypeAliasSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/TypeAliasSpec.scala
rename to src/test/scala/chiselTests/TypeAliasSpec.scala
diff --git a/src/test/scala-2/chiselTests/UIntOps.scala b/src/test/scala/chiselTests/UIntOps.scala
similarity index 90%
rename from src/test/scala-2/chiselTests/UIntOps.scala
rename to src/test/scala/chiselTests/UIntOps.scala
index e6041a41f37..f1e8490aaf6 100644
--- a/src/test/scala-2/chiselTests/UIntOps.scala
+++ b/src/test/scala/chiselTests/UIntOps.scala
@@ -214,62 +214,100 @@ class UIntLitZeroWidthTester extends Module {
 }
 
 trait ShiftRightWidthBehavior extends WidthHelpers {
-  // The UInt and SInt objects don't share a type, so make one up that they can conform to structurally
-  type BitsFactory[T <: Bits] = {
-    def apply():         T
-    def apply(w: Width): T
+  def testSIntShiftRightWidthBehavior(chiselMinWidth: Int, firrtlMinWidth: Int, args: Iterable[String] = Nil): Unit = {
+    assertKnownWidth(4, args) {
+      val in = IO(Input(SInt(8.W)))
+      in >> 4
+    }
+    assertKnownWidth(chiselMinWidth, args) {
+      val in = IO(Input(SInt(8.W)))
+      in >> 8
+    }
+    assertKnownWidth(chiselMinWidth, args) {
+      val in = IO(Input(SInt(8.W)))
+      in >> 16
+    }
+    assertKnownWidth(chiselMinWidth, args) {
+      val in = IO(Input(SInt(0.W)))
+      in >> 8
+    }
+    assertKnownWidth(chiselMinWidth, args) {
+      val in = IO(Input(SInt(0.W)))
+      in >> 0
+    }
+    assertInferredWidth(4, args) {
+      val in = IO(Input(SInt(8.W)))
+      val w = WireInit(SInt(), in)
+      w >> 4
+    }
+    assertInferredWidth(firrtlMinWidth, args) {
+      val in = IO(Input(SInt(8.W)))
+      val w = WireInit(SInt(), in)
+      w >> 8
+    }
+    assertInferredWidth(firrtlMinWidth, args) {
+      val in = IO(Input(SInt(8.W)))
+      val w = WireInit(SInt(), in)
+      w >> 16
+    }
+    assertInferredWidth(firrtlMinWidth, args) {
+      val in = IO(Input(SInt(0.W)))
+      val w = WireInit(SInt(), in)
+      w >> 8
+    }
+    assertInferredWidth(firrtlMinWidth, args) {
+      val in = IO(Input(SInt(0.W)))
+      val w = WireInit(SInt(), in)
+      w >> 0
+    }
   }
-
-  def testShiftRightWidthBehavior[T <: Bits](
-    factory: BitsFactory[T]
-  )(chiselMinWidth: Int, firrtlMinWidth: Int, args: Iterable[String] = Nil): Unit = {
+  def testUIntShiftRightWidthBehavior(chiselMinWidth: Int, firrtlMinWidth: Int, args: Iterable[String] = Nil): Unit = {
     assertKnownWidth(4, args) {
-      val in = IO(Input(factory(8.W)))
+      val in = IO(Input(UInt(8.W)))
       in >> 4
     }
     assertKnownWidth(chiselMinWidth, args) {
-      val in = IO(Input(factory(8.W)))
+      val in = IO(Input(UInt(8.W)))
       in >> 8
     }
     assertKnownWidth(chiselMinWidth, args) {
-      val in = IO(Input(factory(8.W)))
+      val in = IO(Input(UInt(8.W)))
       in >> 16
     }
     assertKnownWidth(chiselMinWidth, args) {
-      val in = IO(Input(factory(0.W)))
+      val in = IO(Input(UInt(0.W)))
       in >> 8
     }
     assertKnownWidth(chiselMinWidth, args) {
-      val in = IO(Input(factory(0.W)))
+      val in = IO(Input(UInt(0.W)))
       in >> 0
     }
     assertInferredWidth(4, args) {
-      val in = IO(Input(factory(8.W)))
-      val w = WireInit(factory(), in)
+      val in = IO(Input(UInt(8.W)))
+      val w = WireInit(UInt(), in)
       w >> 4
     }
     assertInferredWidth(firrtlMinWidth, args) {
-      val in = IO(Input(factory(8.W)))
-      val w = WireInit(factory(), in)
+      val in = IO(Input(UInt(8.W)))
+      val w = WireInit(UInt(), in)
       w >> 8
     }
     assertInferredWidth(firrtlMinWidth, args) {
-      val in = IO(Input(factory(8.W)))
-      val w = WireInit(factory(), in)
+      val in = IO(Input(UInt(8.W)))
+      val w = WireInit(UInt(), in)
       w >> 16
     }
     assertInferredWidth(firrtlMinWidth, args) {
-      val in = IO(Input(factory(0.W)))
-      val w = WireInit(factory(), in)
+      val in = IO(Input(UInt(0.W)))
+      val w = WireInit(UInt(), in)
       w >> 8
     }
     assertInferredWidth(firrtlMinWidth, args) {
-      val in = IO(Input(factory(0.W)))
-      val w = WireInit(factory(), in)
+      val in = IO(Input(UInt(0.W)))
+      val w = WireInit(UInt(), in)
       w >> 0
     }
   }
-
 }
 
 class UIntOpsSpec extends AnyPropSpec with Matchers with LogUtils with ShiftRightWidthBehavior with ChiselSim {
@@ -551,13 +589,13 @@ class UIntOpsSpec extends AnyPropSpec with Matchers with LogUtils with ShiftRigh
   }
 
   property("Static right-shift should have a minimum width of 0") {
-    testShiftRightWidthBehavior(UInt)(chiselMinWidth = 0, firrtlMinWidth = 0)
+    testUIntShiftRightWidthBehavior(chiselMinWidth = 0, firrtlMinWidth = 0)
   }
 
   property("Static right-shift should have width of 0 in Chisel and 1 in FIRRTL with --use-legacy-width") {
     val args = Array("--use-legacy-width")
 
-    testShiftRightWidthBehavior(UInt)(chiselMinWidth = 0, firrtlMinWidth = 1, args = args)
+    testUIntShiftRightWidthBehavior(chiselMinWidth = 0, firrtlMinWidth = 1, args = args)
 
     // Focused test to show the mismatch
     class TestModule extends Module {
diff --git a/src/test/scala-2/chiselTests/UnitTestMainSpec.scala b/src/test/scala/chiselTests/UnitTestMainSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/UnitTestMainSpec.scala
rename to src/test/scala/chiselTests/UnitTestMainSpec.scala
diff --git a/src/test/scala-2/chiselTests/Util.scala b/src/test/scala/chiselTests/Util.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Util.scala
rename to src/test/scala/chiselTests/Util.scala
diff --git a/src/test/scala-2/chiselTests/ValidSpec.scala b/src/test/scala/chiselTests/ValidSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/ValidSpec.scala
rename to src/test/scala/chiselTests/ValidSpec.scala
diff --git a/src/test/scala-2/chiselTests/Vec.scala b/src/test/scala/chiselTests/Vec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/Vec.scala
rename to src/test/scala/chiselTests/Vec.scala
diff --git a/src/test/scala-2/chiselTests/VecToTargetSpec.scala b/src/test/scala/chiselTests/VecToTargetSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/VecToTargetSpec.scala
rename to src/test/scala/chiselTests/VecToTargetSpec.scala
diff --git a/src/test/scala-2/chiselTests/VectorPacketIO.scala b/src/test/scala/chiselTests/VectorPacketIO.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/VectorPacketIO.scala
rename to src/test/scala/chiselTests/VectorPacketIO.scala
diff --git a/src/test/scala-2/chiselTests/VerificationSpec.scala b/src/test/scala/chiselTests/VerificationSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/VerificationSpec.scala
rename to src/test/scala/chiselTests/VerificationSpec.scala
diff --git a/src/test/scala-2/chiselTests/WhenSpec.scala b/src/test/scala/chiselTests/WhenSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/WhenSpec.scala
rename to src/test/scala/chiselTests/WhenSpec.scala
diff --git a/src/test/scala-2/chiselTests/WidthSpec.scala b/src/test/scala/chiselTests/WidthSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/WidthSpec.scala
rename to src/test/scala/chiselTests/WidthSpec.scala
diff --git a/src/test/scala-2/chiselTests/WireSpec.scala b/src/test/scala/chiselTests/WireSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/WireSpec.scala
rename to src/test/scala/chiselTests/WireSpec.scala
diff --git a/src/test/scala-2/chiselTests/naming/IdentifierProposerSpec.scala b/src/test/scala/chiselTests/naming/IdentifierProposerSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/naming/IdentifierProposerSpec.scala
rename to src/test/scala/chiselTests/naming/IdentifierProposerSpec.scala
diff --git a/src/test/scala-2/chiselTests/naming/NamePluginSpec.scala b/src/test/scala/chiselTests/naming/NamePluginSpec.scala
similarity index 99%
rename from src/test/scala-2/chiselTests/naming/NamePluginSpec.scala
rename to src/test/scala/chiselTests/naming/NamePluginSpec.scala
index 5e3d138adb8..427b9b2fc1c 100644
--- a/src/test/scala-2/chiselTests/naming/NamePluginSpec.scala
+++ b/src/test/scala/chiselTests/naming/NamePluginSpec.scala
@@ -3,7 +3,6 @@
 package chiselTests.naming
 
 import chisel3._
-import chisel3.aop.Select
 import chisel3.experimental.prefix
 import chisel3.experimental.AffectsChiselName
 import chisel3.testing.scalatest.FileCheck
diff --git a/src/test/scala-2/chiselTests/naming/PrefixSpec.scala b/src/test/scala/chiselTests/naming/PrefixSpec.scala
similarity index 99%
rename from src/test/scala-2/chiselTests/naming/PrefixSpec.scala
rename to src/test/scala/chiselTests/naming/PrefixSpec.scala
index a84afb9e280..024731a0f26 100644
--- a/src/test/scala-2/chiselTests/naming/PrefixSpec.scala
+++ b/src/test/scala/chiselTests/naming/PrefixSpec.scala
@@ -3,7 +3,6 @@
 package chiselTests.naming
 
 import chisel3._
-import chisel3.aop.Select
 import chisel3.experimental.{noPrefix, prefix, skipPrefix, AffectsChiselPrefix}
 import chisel3.testing.scalatest.FileCheck
 import circt.stage.ChiselStage
diff --git a/src/test/scala-2/chiselTests/naming/TypenameSpec.scala b/src/test/scala/chiselTests/naming/TypenameSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/naming/TypenameSpec.scala
rename to src/test/scala/chiselTests/naming/TypenameSpec.scala
diff --git a/src/test/scala-2/chiselTests/stage/ChiselAnnotationsSpec.scala b/src/test/scala/chiselTests/stage/ChiselAnnotationsSpec.scala
similarity index 98%
rename from src/test/scala-2/chiselTests/stage/ChiselAnnotationsSpec.scala
rename to src/test/scala/chiselTests/stage/ChiselAnnotationsSpec.scala
index c601f51ffef..092fd02b84b 100644
--- a/src/test/scala-2/chiselTests/stage/ChiselAnnotationsSpec.scala
+++ b/src/test/scala/chiselTests/stage/ChiselAnnotationsSpec.scala
@@ -8,6 +8,7 @@ import chisel3.stage.{ChiselCircuitAnnotation, ChiselGeneratorAnnotation, Design
 import firrtl.options.OptionsException
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 
 class ChiselAnnotationsSpecFoo extends RawModule {
   val in = IO(Input(Bool()))
diff --git a/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala b/src/test/scala/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
rename to src/test/scala/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
index faf411ed427..6ba8eacd2c9 100644
--- a/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/AddImplicitOutputAnnotationFileSpec.scala
@@ -6,7 +6,7 @@ import chisel3.RawModule
 import chisel3.stage.ChiselGeneratorAnnotation
 import chisel3.stage.phases.{AddImplicitOutputAnnotationFile, Elaborate}
 
-import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.options.{OutputAnnotationFileAnnotation, Phase}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
diff --git a/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala b/src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
rename to src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
index 20274e7af42..d0987b9be09 100644
--- a/src/test/scala-2/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
@@ -6,7 +6,7 @@ import chisel3.RawModule
 import chisel3.stage.{ChiselGeneratorAnnotation, ChiselOutputFileAnnotation}
 import chisel3.stage.phases.{AddImplicitOutputFile, Elaborate}
 
-import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.options.{Phase, StageOptions, TargetDirAnnotation}
 import firrtl.options.Viewer.view
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/src/test/scala-2/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala b/src/test/scala/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
rename to src/test/scala/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
index 82c708c0eb6..8a96426a5af 100644
--- a/src/test/scala-2/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/AddSerializationAnnotationsSpec.scala
@@ -7,7 +7,7 @@ import chisel3.stage.{ChiselGeneratorAnnotation, ChiselOutputFileAnnotation, Cir
 import chisel3.stage.CircuitSerializationAnnotation._
 import chisel3.stage.phases.{AddImplicitOutputFile, AddSerializationAnnotations, Elaborate}
 
-import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.options.{Dependency, Phase, PhaseManager, TargetDirAnnotation}
 import firrtl.options.Viewer.view
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/src/test/scala-2/chiselTests/stage/phases/ChecksSpec.scala b/src/test/scala/chiselTests/stage/phases/ChecksSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/stage/phases/ChecksSpec.scala
rename to src/test/scala/chiselTests/stage/phases/ChecksSpec.scala
index eb647a75bda..bbb7ccba8ed 100644
--- a/src/test/scala-2/chiselTests/stage/phases/ChecksSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/ChecksSpec.scala
@@ -5,7 +5,7 @@ package chiselTests.stage.phases
 import chisel3.stage.{ChiselOutputFileAnnotation, PrintFullStackTraceAnnotation}
 import chisel3.stage.phases.Checks
 
-import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.annotations.NoTargetAnnotation
 import firrtl.options.{OptionsException, Phase}
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/src/test/scala-2/chiselTests/stage/phases/ConvertSpec.scala b/src/test/scala/chiselTests/stage/phases/ConvertSpec.scala
similarity index 96%
rename from src/test/scala-2/chiselTests/stage/phases/ConvertSpec.scala
rename to src/test/scala/chiselTests/stage/phases/ConvertSpec.scala
index 0372c6fdabe..70ea2022633 100644
--- a/src/test/scala-2/chiselTests/stage/phases/ConvertSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/ConvertSpec.scala
@@ -6,7 +6,7 @@ import chisel3._
 import chisel3.stage.ChiselGeneratorAnnotation
 import chisel3.stage.phases.{Convert, Elaborate}
 
-import firrtl.AnnotationSeq
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.annotations.{Annotation, NoTargetAnnotation}
 import firrtl.options.Phase
 import firrtl.stage.FirrtlCircuitAnnotation
diff --git a/src/test/scala-2/chiselTests/stage/phases/ElaborateSpec.scala b/src/test/scala/chiselTests/stage/phases/ElaborateSpec.scala
similarity index 95%
rename from src/test/scala-2/chiselTests/stage/phases/ElaborateSpec.scala
rename to src/test/scala/chiselTests/stage/phases/ElaborateSpec.scala
index 78812bba506..34cc3c64f56 100644
--- a/src/test/scala-2/chiselTests/stage/phases/ElaborateSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/ElaborateSpec.scala
@@ -7,6 +7,7 @@ import chisel3.stage.{ChiselCircuitAnnotation, ChiselGeneratorAnnotation}
 import chisel3.stage.phases.Elaborate
 
 import firrtl.options.Phase
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
diff --git a/src/test/scala-2/chiselTests/stage/phases/EmitterSpec.scala b/src/test/scala/chiselTests/stage/phases/EmitterSpec.scala
similarity index 94%
rename from src/test/scala-2/chiselTests/stage/phases/EmitterSpec.scala
rename to src/test/scala/chiselTests/stage/phases/EmitterSpec.scala
index ed9964ad99d..2cbb9ab0c04 100644
--- a/src/test/scala-2/chiselTests/stage/phases/EmitterSpec.scala
+++ b/src/test/scala/chiselTests/stage/phases/EmitterSpec.scala
@@ -6,7 +6,8 @@ import chisel3.RawModule
 import chisel3.stage.{ChiselCircuitAnnotation, ChiselGeneratorAnnotation, ChiselOutputFileAnnotation}
 import chisel3.stage.phases.{Convert, Elaborate, Emitter}
 
-import firrtl.{AnnotationSeq, EmittedFirrtlCircuitAnnotation}
+import firrtl.EmittedFirrtlCircuitAnnotation
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import firrtl.options.{Phase, TargetDirAnnotation}
 
 import java.io.File
diff --git a/src/test/scala-2/chiselTests/testing/FileCheckSpec.scala b/src/test/scala/chiselTests/testing/FileCheckSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/testing/FileCheckSpec.scala
rename to src/test/scala/chiselTests/testing/FileCheckSpec.scala
diff --git a/src/test/scala-2/chiselTests/testing/HasTestingDirectorySpec.scala b/src/test/scala/chiselTests/testing/HasTestingDirectorySpec.scala
similarity index 97%
rename from src/test/scala-2/chiselTests/testing/HasTestingDirectorySpec.scala
rename to src/test/scala/chiselTests/testing/HasTestingDirectorySpec.scala
index 6a1aaef6867..d4c00270c8d 100644
--- a/src/test/scala-2/chiselTests/testing/HasTestingDirectorySpec.scala
+++ b/src/test/scala/chiselTests/testing/HasTestingDirectorySpec.scala
@@ -68,8 +68,6 @@ class HasTestingDirectorySpec extends AnyFlatSpec with Matchers {
       testingDirectory.getDirectory
     }
 
-    implicit val bar = implicitly[HasTestingDirectory]
-
     foo should be(foo)
 
   }
diff --git a/src/test/scala-2/chiselTests/testing/scalatest/HasConfigMapSpec.scala b/src/test/scala/chiselTests/testing/scalatest/HasConfigMapSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/testing/scalatest/HasConfigMapSpec.scala
rename to src/test/scala/chiselTests/testing/scalatest/HasConfigMapSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/AttributeAnnotationSpec.scala b/src/test/scala/chiselTests/util/AttributeAnnotationSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/AttributeAnnotationSpec.scala
rename to src/test/scala/chiselTests/util/AttributeAnnotationSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/BitSetSpec.scala b/src/test/scala/chiselTests/util/BitSetSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/BitSetSpec.scala
rename to src/test/scala/chiselTests/util/BitSetSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/BitwiseSpec.scala b/src/test/scala/chiselTests/util/BitwiseSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/BitwiseSpec.scala
rename to src/test/scala/chiselTests/util/BitwiseSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/CatSpec.scala b/src/test/scala/chiselTests/util/CatSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/CatSpec.scala
rename to src/test/scala/chiselTests/util/CatSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/PipeSpec.scala b/src/test/scala/chiselTests/util/PipeSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/PipeSpec.scala
rename to src/test/scala/chiselTests/util/PipeSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/PriorityMuxSpec.scala b/src/test/scala/chiselTests/util/PriorityMuxSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/PriorityMuxSpec.scala
rename to src/test/scala/chiselTests/util/PriorityMuxSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/RegSpec.scala b/src/test/scala/chiselTests/util/RegSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/RegSpec.scala
rename to src/test/scala/chiselTests/util/RegSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/ClockGate.scala b/src/test/scala/chiselTests/util/circt/ClockGate.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/ClockGate.scala
rename to src/test/scala/chiselTests/util/circt/ClockGate.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/IsXSpec.scala b/src/test/scala/chiselTests/util/circt/IsXSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/IsXSpec.scala
rename to src/test/scala/chiselTests/util/circt/IsXSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/PlusArgsTestSpec.scala b/src/test/scala/chiselTests/util/circt/PlusArgsTestSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/PlusArgsTestSpec.scala
rename to src/test/scala/chiselTests/util/circt/PlusArgsTestSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/PlusArgsValueSpec.scala b/src/test/scala/chiselTests/util/circt/PlusArgsValueSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/PlusArgsValueSpec.scala
rename to src/test/scala/chiselTests/util/circt/PlusArgsValueSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/SizeOfSpec.scala b/src/test/scala/chiselTests/util/circt/SizeOfSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/SizeOfSpec.scala
rename to src/test/scala/chiselTests/util/circt/SizeOfSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/circt/Synthesis.scala b/src/test/scala/chiselTests/util/circt/Synthesis.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/circt/Synthesis.scala
rename to src/test/scala/chiselTests/util/circt/Synthesis.scala
diff --git a/src/test/scala-2/chiselTests/util/experimental/DecoderTableSpec.scala b/src/test/scala/chiselTests/util/experimental/DecoderTableSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/experimental/DecoderTableSpec.scala
rename to src/test/scala/chiselTests/util/experimental/DecoderTableSpec.scala
diff --git a/src/test/scala-2/chiselTests/util/random/PRNGSpec.scala b/src/test/scala/chiselTests/util/random/PRNGSpec.scala
similarity index 100%
rename from src/test/scala-2/chiselTests/util/random/PRNGSpec.scala
rename to src/test/scala/chiselTests/util/random/PRNGSpec.scala
diff --git a/src/test/scala-2/circtTests/ConventionSpec.scala b/src/test/scala/circtTests/ConventionSpec.scala
similarity index 100%
rename from src/test/scala-2/circtTests/ConventionSpec.scala
rename to src/test/scala/circtTests/ConventionSpec.scala
diff --git a/src/test/scala-2/circtTests/OutputDirAnnotationSpec.scala b/src/test/scala/circtTests/OutputDirAnnotationSpec.scala
similarity index 94%
rename from src/test/scala-2/circtTests/OutputDirAnnotationSpec.scala
rename to src/test/scala/circtTests/OutputDirAnnotationSpec.scala
index b26a6372471..61e5b71c97c 100644
--- a/src/test/scala-2/circtTests/OutputDirAnnotationSpec.scala
+++ b/src/test/scala/circtTests/OutputDirAnnotationSpec.scala
@@ -7,7 +7,7 @@ import circt.outputDir
 import circt.stage.ChiselStage
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
-import chiselTests.experimental.hierarchy.Utils
+// import chiselTests.experimental.hierarchy.Utils
 
 class OutputDirAnnotationSpec extends AnyFunSpec with Matchers {
   describe("output directory annotation works") {
diff --git a/src/test/scala-2/circtTests/stage/ChiselMainSpec.scala b/src/test/scala/circtTests/stage/ChiselMainSpec.scala
similarity index 100%
rename from src/test/scala-2/circtTests/stage/ChiselMainSpec.scala
rename to src/test/scala/circtTests/stage/ChiselMainSpec.scala
diff --git a/src/test/scala-2/circtTests/stage/phases/AddImplicitOutputFileSpec.scala b/src/test/scala/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
similarity index 96%
rename from src/test/scala-2/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
rename to src/test/scala/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
index ce8b76d739b..b348623f58f 100644
--- a/src/test/scala-2/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
+++ b/src/test/scala/circtTests/stage/phases/AddImplicitOutputFileSpec.scala
@@ -5,6 +5,7 @@ package circtTests.stage.phases
 import firrtl.ir
 import firrtl.options.Phase
 import firrtl.stage.{FirrtlCircuitAnnotation, OutputFileAnnotation}
+import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
 import circt.stage.phases.AddImplicitOutputFile
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
diff --git a/src/test/scala-2/cookbook/Bundle2UInt.scala b/src/test/scala/cookbook/Bundle2UInt.scala
similarity index 100%
rename from src/test/scala-2/cookbook/Bundle2UInt.scala
rename to src/test/scala/cookbook/Bundle2UInt.scala
diff --git a/src/test/scala-2/cookbook/CookbookSpec.scala b/src/test/scala/cookbook/CookbookSpec.scala
similarity index 100%
rename from src/test/scala-2/cookbook/CookbookSpec.scala
rename to src/test/scala/cookbook/CookbookSpec.scala
diff --git a/src/test/scala-2/cookbook/RegOfVec.scala b/src/test/scala/cookbook/RegOfVec.scala
similarity index 100%
rename from src/test/scala-2/cookbook/RegOfVec.scala
rename to src/test/scala/cookbook/RegOfVec.scala
diff --git a/src/test/scala-2/cookbook/UInt2Bundle.scala b/src/test/scala/cookbook/UInt2Bundle.scala
similarity index 100%
rename from src/test/scala-2/cookbook/UInt2Bundle.scala
rename to src/test/scala/cookbook/UInt2Bundle.scala
diff --git a/src/test/scala-2/cookbook/UInt2VecOfBool.scala b/src/test/scala/cookbook/UInt2VecOfBool.scala
similarity index 100%
rename from src/test/scala-2/cookbook/UInt2VecOfBool.scala
rename to src/test/scala/cookbook/UInt2VecOfBool.scala
diff --git a/src/test/scala-2/cookbook/VecOfBool2UInt.scala b/src/test/scala/cookbook/VecOfBool2UInt.scala
similarity index 100%
rename from src/test/scala-2/cookbook/VecOfBool2UInt.scala
rename to src/test/scala/cookbook/VecOfBool2UInt.scala
diff --git a/src/test/scala-2/examples/ImplicitStateVendingMachine.scala b/src/test/scala/examples/ImplicitStateVendingMachine.scala
similarity index 100%
rename from src/test/scala-2/examples/ImplicitStateVendingMachine.scala
rename to src/test/scala/examples/ImplicitStateVendingMachine.scala
diff --git a/src/test/scala-2/examples/SimpleVendingMachine.scala b/src/test/scala/examples/SimpleVendingMachine.scala
similarity index 100%
rename from src/test/scala-2/examples/SimpleVendingMachine.scala
rename to src/test/scala/examples/SimpleVendingMachine.scala
diff --git a/src/test/scala-2/examples/VendingMachineGenerator.scala b/src/test/scala/examples/VendingMachineGenerator.scala
similarity index 100%
rename from src/test/scala-2/examples/VendingMachineGenerator.scala
rename to src/test/scala/examples/VendingMachineGenerator.scala
diff --git a/src/test/scala-2/examples/VendingMachineUtils.scala b/src/test/scala/examples/VendingMachineUtils.scala
similarity index 100%
rename from src/test/scala-2/examples/VendingMachineUtils.scala
rename to src/test/scala/examples/VendingMachineUtils.scala