Fix some test suite handling

build.sbt

@@ -21,11 +21,11 @@ lazy val commonSettings = Seq(
 
 val rocketChipDir = file("generators/rocket-chip")
 
-lazy val firesimAsLibrary = sys.env.get("FIRESIM_IS_TOP") == None
+lazy val firesimAsLibrary = sys.env.get("FIRESIM_STANDALONE") == None
 lazy val firesimDir = if (firesimAsLibrary) {
   file("sims/firesim/sim/")
 } else {
-  file("../../sim/")
+  file("../../")
 }
 
 // Checks for -DROCKET_USE_MAVEN.

generators/firechip/src/main/scala/TargetConfigs.scala

@@ -17,7 +17,7 @@ import icenet._
 class WithBootROM extends Config((site, here, up) => {
   case BootROMParams => {
     val rebarBootROM = new File(s"./generators/testchipip/bootrom/bootrom.rv${site(XLen)}.img")
-    val firesimBootROM = new File(s"./target-rtl/testchipip/bootrom/bootrom.rv${site(XLen)}.img")
+    val firesimBootROM = new File(s"./target-rtl/firechip/generators/testchipip/bootrom/bootrom.rv${site(XLen)}.img")
 
      val bootROMPath = if (rebarBootROM.exists()) {
       rebarBootROM.getAbsolutePath()

generators/firechip/src/test/scala/ScalaTestSuite.scala

@@ -19,7 +19,7 @@ abstract class FireSimTestSuite(
     targetConfigs: String,
     platformConfigs: String,
     N: Int = 8
-  ) extends firesim.midasexamples.TestSuiteCommon with HasFireSimGeneratorUtilities {
+  ) extends firesim.TestSuiteCommon with IsFireSimGeneratorLike {
   import scala.concurrent.duration._
   import ExecutionContext.Implicits.global