2 files changed, 16 insertions, 24 deletions
diff --git a/core/src/test/scala/mill/define/BasePathTests.scala b/core/src/test/scala/mill/define/BasePathTests.scala
index 577b89c8..a0be4762 100644
--- a/core/src/test/scala/mill/define/BasePathTests.scala
+++ b/core/src/test/scala/mill/define/BasePathTests.scala
@@ -11,37 +11,37 @@ object BasePathTests extends TestSuite{
       assert(remaining == segments)
     }
     'singleton - {
-      check(testGraphs.singleton, "singleton")
+      check(testGraphs.singleton)
     }
     'separateGroups - {
-      check(TestGraphs.triangleTask, "triangleTask")
+      check(TestGraphs.triangleTask)
     }
     'TraitWithModuleObject - {
       check(TestGraphs.TraitWithModuleObject.TraitModule,
-       "TraitWithModuleObject", "TraitModule"
+       "TraitModule"
       )
     }
     'nestedModuleNested - {
-      check(TestGraphs.nestedModule.nested, "nestedModule", "nested")
+      check(TestGraphs.nestedModule.nested, "nested")
     }
     'nestedModuleInstance - {
-      check(TestGraphs.nestedModule.classInstance,  "nestedModule", "classInstance")
+      check(TestGraphs.nestedModule.classInstance, "classInstance")
     }
     'singleCross - {
-      check(TestGraphs.singleCross.cross, "singleCross", "cross")
-      check(TestGraphs.singleCross.cross("210"), "singleCross", "cross", "210")
-      check(TestGraphs.singleCross.cross("211"), "singleCross", "cross", "211")
+      check(TestGraphs.singleCross.cross, "cross")
+      check(TestGraphs.singleCross.cross("210"), "cross", "210")
+      check(TestGraphs.singleCross.cross("211"), "cross", "211")
     }
     'doubleCross - {
-      check(TestGraphs.doubleCross.cross, "doubleCross", "cross")
-      check(TestGraphs.doubleCross.cross("210", "jvm"), "doubleCross", "cross", "210", "jvm")
-      check(TestGraphs.doubleCross.cross("212", "js"), "doubleCross", "cross", "212", "js")
+      check(TestGraphs.doubleCross.cross, "cross")
+      check(TestGraphs.doubleCross.cross("210", "jvm"), "cross", "210", "jvm")
+      check(TestGraphs.doubleCross.cross("212", "js"), "cross", "212", "js")
     }
     'nestedCrosses - {
-      check(TestGraphs.nestedCrosses.cross, "nestedCrosses", "cross")
+      check(TestGraphs.nestedCrosses.cross, "cross")
       check(
         TestGraphs.nestedCrosses.cross("210").cross2("js"),
-        "nestedCrosses", "cross", "210", "cross2", "js"
+        "cross", "210", "cross2", "js"
       )
     }
 
diff --git a/core/src/test/scala/mill/util/TestUtil.scala b/core/src/test/scala/mill/util/TestUtil.scala
index c0985c97..1af12a74 100644
--- a/core/src/test/scala/mill/util/TestUtil.scala
+++ b/core/src/test/scala/mill/util/TestUtil.scala
@@ -12,16 +12,8 @@ object TestUtil {
                    millModuleLine0: sourcecode.Line,
                    millName0: sourcecode.Name,
                    overrides: Overrides)
-    extends Module()(
-      mill.define.Ctx.make(
-        implicitly,
-        implicitly,
-        implicitly,
-        BasePath(ammonite.ops.pwd / millModuleEnclosing0.value),
-        Segments(),
-        implicitly
-      )
-    )
+    extends mill.define.BaseModule(ammonite.ops.pwd / millModuleEnclosing0.value)
+
   object test{
 
     def anon(inputs: Task[Int]*) = new Test(inputs)
@@ -51,7 +43,7 @@ object TestUtil {
                    val pure: Boolean)
                   (implicit ctx0: mill.define.Ctx)
     extends Test(inputs) with Target[Int]{
-    val ctx = ctx0.copy(segments0 = ctx0.segments0 ++ Seq(ctx0.segment))
+    val ctx = ctx0.copy(segments = ctx0.segments ++ Seq(ctx0.segment))
     val readWrite = upickle.default.IntRW