diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala
index cfc55489b..5843c97ae 100644
--- a/project/build/XSbt.scala
+++ b/project/build/XSbt.scala
@@ -45,15 +45,19 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 	val buildSub = baseProject("main" / "build", "Project Builder",
 		classfileSub, classpathSub, compilePersistSub, compilerSub, compileIncrementalSub, interfaceSub, ivySub, launchInterfaceSub, logSub, discoverySub, processSub)
 
+	val scriptedBaseSub = project("scripted" / "base", "Scripted Framework", new TestProject(_), ioSub, processSub)
+	val scriptedSbtSub = baseProject("scripted" / "sbt", "Scripted sbt", ioSub, logSub, processSub, scriptedBaseSub, launchInterfaceSub /*should really be a 'provided' dependency*/)
+	val scriptedPluginSub = project("scripted" / "plugin", "Scripted Plugin", new Scripted(_))
+
+		// Standard task system.  This provides map, flatMap, join, and more on top of the basic task model.
 	val stdTaskSub = testedBase(tasksPath / "standard", "Task System", taskSub, collectionSub, logSub, ioSub, processSub)
 	val mainSub = baseProject("main", "Main",
 		buildSub, compileIncrementalSub, compilerSub, completeSub, discoverySub, ioSub, logSub, processSub, taskSub, stdTaskSub, runSub, trackingSub)
-	val sbtSub = project(sbtPath, "Simple Build Tool", (i: ProjectInfo) => new Base(i) { override def normalizedName = "sbt" }, 
-		mainSub) // technically, we need a dependency on all of mainSub's dependencies, but we don't do that since this is strictly an integration project
+		// Strictly for bringing implicits and aliases from subsystems into the top-level sbt namespace through a single package object
+	val sbtSub = project(sbtPath, "Simple Build Tool", new Sbt(_), mainSub) // technically, we need a dependency on all of mainSub's dependencies, but we don't do that since this is strictly an integration project
 
 	/** following modules are not updated for 2.8 or 0.9 */
-	/*val testSub = project("scripted", "Test", new TestProject(_), ioSub)
-
+	/*
 	val sbtSub = project(sbtPath, "Simple Build Tool", new SbtProject(_) {},
 		compilerSub, launchInterfaceSub, testingSub, cacheSub, taskSub)
 
@@ -231,6 +235,11 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 	{
 		override def componentID = None
 	}
+	class Scripted(info: ProjectInfo) extends PluginProject(info) with Licensed
+	{
+		override def managedStyle = ManagedStyle.Ivy
+		override def scratch = true
+	}
 	class TestProject(info: ProjectInfo) extends Base(info)
 	{
 		val process = "org.scala-tools.sbt" % "process" % "0.1"
@@ -295,4 +304,20 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
 		override def testCompileAction = super.testCompileAction dependsOn((testWithTestClasspath.map(_.testCompile) ++ testWithCompileClasspath.map(_.compile)) : _*)
 		override def testClasspath = (super.testClasspath /: (testWithTestClasspath.map(_.testClasspath) ++  testWithCompileClasspath.map(_.compileClasspath) ))(_ +++ _)
 	}
+	class Sbt(info: ProjectInfo) extends Base(info) with TestWith
+	{
+		override def normalizedName = "sbt"
+		override def testWithCompileClasspath = super.testWithCompileClasspath ++ Seq(scriptedSbtSub)
+		override def testAction = super.testAction dependsOn(publishLocal)
+		def scriptedScalaVersions = "2.8.1.RC1"
+		lazy val scripted = task { args => task {
+			val launcher  = launchSub.outputJar.asFile
+			val loader = ClasspathUtilities.toLoader(scriptedSbtSub.testClasspath, buildScalaInstance.loader)
+			val m = ModuleUtilities.getObject("sbt.test.ScriptedTests", loader)
+			val r = m.getClass.getMethod("run", classOf[File], classOf[Boolean], classOf[String], classOf[String], classOf[String], classOf[Array[String]], classOf[File])
+			try { r.invoke(m, sourcePath / "sbt-test" asFile, true: java.lang.Boolean, version.toString, buildScalaVersion, scriptedScalaVersions, args, launcher) }
+			catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
+			None
+		} dependsOn(publishLocal, scriptedSbtSub.compile) }
+	}
 }
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject2.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject2.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject2.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject3.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject3.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject3.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject3.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject4.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject4.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject4.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject4.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject5.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject5.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject5.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject5.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject6.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject6.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject6.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject6.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/changes/TestProject7.scala b/sbt/src/sbt-test/actions/interactive/changes/TestProject7.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/changes/TestProject7.scala
rename to sbt/src/sbt-test/actions/interactive/changes/TestProject7.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/project/build.properties b/sbt/src/sbt-test/actions/interactive/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/project/build.properties
rename to sbt/src/sbt-test/actions/interactive/project/build.properties
diff --git a/sbt_pending/src/sbt-test/actions/interactive/project/build/src/Marker.scala b/sbt/src/sbt-test/actions/interactive/project/build/src/Marker.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/project/build/src/Marker.scala
rename to sbt/src/sbt-test/actions/interactive/project/build/src/Marker.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/project/build/src/TestProject.scala b/sbt/src/sbt-test/actions/interactive/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/actions/interactive/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/actions/interactive/test b/sbt/src/sbt-test/actions/interactive/test
similarity index 100%
rename from sbt_pending/src/sbt-test/actions/interactive/test
rename to sbt/src/sbt-test/actions/interactive/test
diff --git a/sbt_pending/src/sbt-test/compiler-project/run-test/project/build.properties b/sbt/src/sbt-test/compiler-project/run-test/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run-test/project/build.properties
rename to sbt/src/sbt-test/compiler-project/run-test/project/build.properties
diff --git a/sbt_pending/src/sbt-test/compiler-project/run-test/project/build/P.scala b/sbt/src/sbt-test/compiler-project/run-test/project/build/P.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run-test/project/build/P.scala
rename to sbt/src/sbt-test/compiler-project/run-test/project/build/P.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/sbt/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
rename to sbt/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run-test/src/test/scala/Basic.scala b/sbt/src/sbt-test/compiler-project/run-test/src/test/scala/Basic.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run-test/src/test/scala/Basic.scala
rename to sbt/src/sbt-test/compiler-project/run-test/src/test/scala/Basic.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run-test/test b/sbt/src/sbt-test/compiler-project/run-test/test
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run-test/test
rename to sbt/src/sbt-test/compiler-project/run-test/test
diff --git a/sbt_pending/src/sbt-test/compiler-project/run2.8/project/build.properties b/sbt/src/sbt-test/compiler-project/run2.8/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run2.8/project/build.properties
rename to sbt/src/sbt-test/compiler-project/run2.8/project/build.properties
diff --git a/sbt_pending/src/sbt-test/compiler-project/run2.8/project/build/A.scala b/sbt/src/sbt-test/compiler-project/run2.8/project/build/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run2.8/project/build/A.scala
rename to sbt/src/sbt-test/compiler-project/run2.8/project/build/A.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run2.8/src/main/scala/Foo.scala b/sbt/src/sbt-test/compiler-project/run2.8/src/main/scala/Foo.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run2.8/src/main/scala/Foo.scala
rename to sbt/src/sbt-test/compiler-project/run2.8/src/main/scala/Foo.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run2.8/src/test/scala/ATest.scala b/sbt/src/sbt-test/compiler-project/run2.8/src/test/scala/ATest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run2.8/src/test/scala/ATest.scala
rename to sbt/src/sbt-test/compiler-project/run2.8/src/test/scala/ATest.scala
diff --git a/sbt_pending/src/sbt-test/compiler-project/run2.8/test b/sbt/src/sbt-test/compiler-project/run2.8/test
similarity index 100%
rename from sbt_pending/src/sbt-test/compiler-project/run2.8/test
rename to sbt/src/sbt-test/compiler-project/run2.8/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/artifact/project/build.properties b/sbt/src/sbt-test/dependency-management/artifact/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/artifact/project/build.properties
rename to sbt/src/sbt-test/dependency-management/artifact/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala b/sbt/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
rename to sbt/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala b/sbt/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
rename to sbt/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/artifact/test b/sbt/src/sbt-test/dependency-management/artifact/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/artifact/test
rename to sbt/src/sbt-test/dependency-management/artifact/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/classifier/project/build.properties b/sbt/src/sbt-test/dependency-management/classifier/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/classifier/project/build.properties
rename to sbt/src/sbt-test/dependency-management/classifier/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/classifier/project/build/Test.scala b/sbt/src/sbt-test/dependency-management/classifier/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/classifier/project/build/Test.scala
rename to sbt/src/sbt-test/dependency-management/classifier/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/classifier/test b/sbt/src/sbt-test/dependency-management/classifier/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/classifier/test
rename to sbt/src/sbt-test/dependency-management/classifier/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala b/sbt/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
rename to sbt/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/project/build.properties b/sbt/src/sbt-test/dependency-management/configurations/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/project/build.properties
rename to sbt/src/sbt-test/dependency-management/configurations/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala b/sbt/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
rename to sbt/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/configurations/test b/sbt/src/sbt-test/dependency-management/configurations/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/configurations/test
rename to sbt/src/sbt-test/dependency-management/configurations/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-scala/project/build.properties b/sbt/src/sbt-test/dependency-management/exclude-scala/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-scala/project/build.properties
rename to sbt/src/sbt-test/dependency-management/exclude-scala/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-scala/project/build/ExcludeScala.scala b/sbt/src/sbt-test/dependency-management/exclude-scala/project/build/ExcludeScala.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-scala/project/build/ExcludeScala.scala
rename to sbt/src/sbt-test/dependency-management/exclude-scala/project/build/ExcludeScala.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-scala/test b/sbt/src/sbt-test/dependency-management/exclude-scala/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-scala/test
rename to sbt/src/sbt-test/dependency-management/exclude-scala/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-transitive/project/build.properties b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-transitive/project/build.properties
rename to sbt/src/sbt-test/dependency-management/exclude-transitive/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/exclude-transitive/test b/sbt/src/sbt-test/dependency-management/exclude-transitive/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/exclude-transitive/test
rename to sbt/src/sbt-test/dependency-management/exclude-transitive/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/changes/UseColor.scala
rename to sbt/src/sbt-test/dependency-management/extra/changes/UseColor.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/changes/blue b/sbt/src/sbt-test/dependency-management/extra/changes/blue
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/changes/blue
rename to sbt/src/sbt-test/dependency-management/extra/changes/blue
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/changes/color b/sbt/src/sbt-test/dependency-management/extra/changes/color
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/changes/color
rename to sbt/src/sbt-test/dependency-management/extra/changes/color
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/changes/red b/sbt/src/sbt-test/dependency-management/extra/changes/red
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/changes/red
rename to sbt/src/sbt-test/dependency-management/extra/changes/red
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/project/build.properties b/sbt/src/sbt-test/dependency-management/extra/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/project/build.properties
rename to sbt/src/sbt-test/dependency-management/extra/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala b/sbt/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
rename to sbt/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/extra/test b/sbt/src/sbt-test/dependency-management/extra/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/extra/test
rename to sbt/src/sbt-test/dependency-management/extra/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/info/project/build.properties b/sbt/src/sbt-test/dependency-management/info/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/info/project/build.properties
rename to sbt/src/sbt-test/dependency-management/info/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/info/project/build/InfoTest.scala b/sbt/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
rename to sbt/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/info/test b/sbt/src/sbt-test/dependency-management/info/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/info/test
rename to sbt/src/sbt-test/dependency-management/info/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
rename to sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
rename to sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
rename to sbt/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/project/build.properties b/sbt/src/sbt-test/dependency-management/inherit-repo/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/project/build.properties
rename to sbt/src/sbt-test/dependency-management/inherit-repo/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inherit-repo/test b/sbt/src/sbt-test/dependency-management/inherit-repo/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inherit-repo/test
rename to sbt/src/sbt-test/dependency-management/inherit-repo/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-default/project/build.properties b/sbt/src/sbt-test/dependency-management/inline-default/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-default/project/build.properties
rename to sbt/src/sbt-test/dependency-management/inline-default/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-default/test b/sbt/src/sbt-test/dependency-management/inline-default/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-default/test
rename to sbt/src/sbt-test/dependency-management/inline-default/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties
rename to sbt/src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
rename to sbt/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/test b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/inline-dependencies-a/test
rename to sbt/src/sbt-test/dependency-management/inline-dependencies-a/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/ivy.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/ivy.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/ivy.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/ivy.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/project/build.properties b/sbt/src/sbt-test/dependency-management/ivy-settings-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/project/build.properties
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/test b/sbt/src/sbt-test/dependency-management/ivy-settings-a/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-a/test
rename to sbt/src/sbt-test/dependency-management/ivy-settings-a/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml
rename to sbt/src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/project/build.properties b/sbt/src/sbt-test/dependency-management/ivy-settings-b/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/project/build.properties
rename to sbt/src/sbt-test/dependency-management/ivy-settings-b/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
rename to sbt/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/test b/sbt/src/sbt-test/dependency-management/ivy-settings-b/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/ivy-settings-b/test
rename to sbt/src/sbt-test/dependency-management/ivy-settings-b/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/java.net/project/build.properties b/sbt/src/sbt-test/dependency-management/java.net/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/java.net/project/build.properties
rename to sbt/src/sbt-test/dependency-management/java.net/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/java.net/test b/sbt/src/sbt-test/dependency-management/java.net/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/java.net/test
rename to sbt/src/sbt-test/dependency-management/java.net/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/make-pom/project/build.properties b/sbt/src/sbt-test/dependency-management/make-pom/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/make-pom/project/build.properties
rename to sbt/src/sbt-test/dependency-management/make-pom/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala b/sbt/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
rename to sbt/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/make-pom/test b/sbt/src/sbt-test/dependency-management/make-pom/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/make-pom/test
rename to sbt/src/sbt-test/dependency-management/make-pom/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala b/sbt/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
rename to sbt/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala b/sbt/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
rename to sbt/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala b/sbt/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
rename to sbt/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/project/build.properties b/sbt/src/sbt-test/dependency-management/module-confs/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/project/build.properties
rename to sbt/src/sbt-test/dependency-management/module-confs/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/sbt/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
rename to sbt/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/module-confs/test b/sbt/src/sbt-test/dependency-management/module-confs/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/module-confs/test
rename to sbt/src/sbt-test/dependency-management/module-confs/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/package-to-publish/project/build.properties b/sbt/src/sbt-test/dependency-management/package-to-publish/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/package-to-publish/project/build.properties
rename to sbt/src/sbt-test/dependency-management/package-to-publish/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala b/sbt/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
rename to sbt/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala b/sbt/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
rename to sbt/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/package-to-publish/test b/sbt/src/sbt-test/dependency-management/package-to-publish/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/package-to-publish/test
rename to sbt/src/sbt-test/dependency-management/package-to-publish/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
rename to sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
rename to sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
rename to sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/test b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-ivy-settings/test
rename to sbt/src/sbt-test/dependency-management/parent-ivy-settings/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-publish/project/build.properties b/sbt/src/sbt-test/dependency-management/parent-publish/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-publish/project/build.properties
rename to sbt/src/sbt-test/dependency-management/parent-publish/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala b/sbt/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
rename to sbt/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/parent-publish/test b/sbt/src/sbt-test/dependency-management/parent-publish/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/parent-publish/test
rename to sbt/src/sbt-test/dependency-management/parent-publish/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-advanced/project/build.properties b/sbt/src/sbt-test/dependency-management/pom-advanced/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-advanced/project/build.properties
rename to sbt/src/sbt-test/dependency-management/pom-advanced/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-advanced/project/build/PomRepoTest.scala b/sbt/src/sbt-test/dependency-management/pom-advanced/project/build/PomRepoTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-advanced/project/build/PomRepoTest.scala
rename to sbt/src/sbt-test/dependency-management/pom-advanced/project/build/PomRepoTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-advanced/test b/sbt/src/sbt-test/dependency-management/pom-advanced/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-advanced/test
rename to sbt/src/sbt-test/dependency-management/pom-advanced/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-packaging/project/build.properties b/sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-packaging/project/build.properties
rename to sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala
rename to sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/pom-packaging/test b/sbt/src/sbt-test/dependency-management/pom-packaging/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/pom-packaging/test
rename to sbt/src/sbt-test/dependency-management/pom-packaging/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/A.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/A.scala
rename to sbt/src/sbt-test/dependency-management/provided-multi/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/B.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/B.scala
rename to sbt/src/sbt-test/dependency-management/provided-multi/changes/B.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/P.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided-multi/changes/P.scala
rename to sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided-multi/project/build.properties b/sbt/src/sbt-test/dependency-management/provided-multi/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided-multi/project/build.properties
rename to sbt/src/sbt-test/dependency-management/provided-multi/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided-multi/test b/sbt/src/sbt-test/dependency-management/provided-multi/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided-multi/test
rename to sbt/src/sbt-test/dependency-management/provided-multi/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided/project/build.properties b/sbt/src/sbt-test/dependency-management/provided/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided/project/build.properties
rename to sbt/src/sbt-test/dependency-management/provided/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/provided/test b/sbt/src/sbt-test/dependency-management/provided/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/provided/test
rename to sbt/src/sbt-test/dependency-management/provided/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/publish-local/project/build.properties b/sbt/src/sbt-test/dependency-management/publish-local/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/publish-local/project/build.properties
rename to sbt/src/sbt-test/dependency-management/publish-local/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
rename to sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala
rename to sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/publish-local/test b/sbt/src/sbt-test/dependency-management/publish-local/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/publish-local/test
rename to sbt/src/sbt-test/dependency-management/publish-local/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/sources/project/build.properties b/sbt/src/sbt-test/dependency-management/sources/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/sources/project/build.properties
rename to sbt/src/sbt-test/dependency-management/sources/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/sources/project/build/Test.scala b/sbt/src/sbt-test/dependency-management/sources/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/sources/project/build/Test.scala
rename to sbt/src/sbt-test/dependency-management/sources/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/sources/test b/sbt/src/sbt-test/dependency-management/sources/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/sources/test
rename to sbt/src/sbt-test/dependency-management/sources/test
diff --git a/sbt_pending/src/sbt-test/dependency-management/url/project/build.properties b/sbt/src/sbt-test/dependency-management/url/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/url/project/build.properties
rename to sbt/src/sbt-test/dependency-management/url/project/build.properties
diff --git a/sbt_pending/src/sbt-test/dependency-management/url/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/url/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/url/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/dependency-management/url/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/dependency-management/url/test b/sbt/src/sbt-test/dependency-management/url/test
similarity index 100%
rename from sbt_pending/src/sbt-test/dependency-management/url/test
rename to sbt/src/sbt-test/dependency-management/url/test
diff --git a/sbt_pending/src/sbt-test/java/analysis/project/build.properties b/sbt/src/sbt-test/java/analysis/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/analysis/project/build.properties
rename to sbt/src/sbt-test/java/analysis/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/analysis/src/main/java/test/R.java b/sbt/src/sbt-test/java/analysis/src/main/java/test/R.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/analysis/src/main/java/test/R.java
rename to sbt/src/sbt-test/java/analysis/src/main/java/test/R.java
diff --git a/sbt_pending/src/sbt-test/java/analysis/test b/sbt/src/sbt-test/java/analysis/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/analysis/test
rename to sbt/src/sbt-test/java/analysis/test
diff --git a/sbt_pending/src/sbt-test/java/argfile/project/build.properties b/sbt/src/sbt-test/java/argfile/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/argfile/project/build.properties
rename to sbt/src/sbt-test/java/argfile/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/argfile/project/build/A.scala b/sbt/src/sbt-test/java/argfile/project/build/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/argfile/project/build/A.scala
rename to sbt/src/sbt-test/java/argfile/project/build/A.scala
diff --git a/sbt_pending/src/sbt-test/java/argfile/src/ java test /a/A.java b/sbt/src/sbt-test/java/argfile/src/ java test /a/A.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/argfile/src/ java test /a/A.java
rename to sbt/src/sbt-test/java/argfile/src/ java test /a/A.java
diff --git a/sbt_pending/src/sbt-test/java/argfile/src/ scala test /Test s.scala b/sbt/src/sbt-test/java/argfile/src/ scala test /Test s.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/argfile/src/ scala test /Test s.scala
rename to sbt/src/sbt-test/java/argfile/src/ scala test /Test s.scala
diff --git a/sbt_pending/src/sbt-test/java/argfile/test b/sbt/src/sbt-test/java/argfile/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/argfile/test
rename to sbt/src/sbt-test/java/argfile/test
diff --git a/sbt_pending/src/sbt-test/java/basic/project/build.properties b/sbt/src/sbt-test/java/basic/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/basic/project/build.properties
rename to sbt/src/sbt-test/java/basic/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/basic/src/main/java/test/R.java b/sbt/src/sbt-test/java/basic/src/main/java/test/R.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/basic/src/main/java/test/R.java
rename to sbt/src/sbt-test/java/basic/src/main/java/test/R.java
diff --git a/sbt_pending/src/sbt-test/java/basic/src/main/scala/S.scala b/sbt/src/sbt-test/java/basic/src/main/scala/S.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/basic/src/main/scala/S.scala
rename to sbt/src/sbt-test/java/basic/src/main/scala/S.scala
diff --git a/sbt_pending/src/sbt-test/java/basic/test b/sbt/src/sbt-test/java/basic/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/basic/test
rename to sbt/src/sbt-test/java/basic/test
diff --git a/sbt_pending/src/sbt-test/java/options/project/build.properties b/sbt/src/sbt-test/java/options/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/options/project/build.properties
rename to sbt/src/sbt-test/java/options/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/options/project/build/src/JavaProject.scala b/sbt/src/sbt-test/java/options/project/build/src/JavaProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/options/project/build/src/JavaProject.scala
rename to sbt/src/sbt-test/java/options/project/build/src/JavaProject.scala
diff --git a/sbt_pending/src/sbt-test/java/options/src/main/java/test/R.java b/sbt/src/sbt-test/java/options/src/main/java/test/R.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/options/src/main/java/test/R.java
rename to sbt/src/sbt-test/java/options/src/main/java/test/R.java
diff --git a/sbt_pending/src/sbt-test/java/options/src/main/scala/S.scala b/sbt/src/sbt-test/java/options/src/main/scala/S.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/options/src/main/scala/S.scala
rename to sbt/src/sbt-test/java/options/src/main/scala/S.scala
diff --git a/sbt_pending/src/sbt-test/java/options/test b/sbt/src/sbt-test/java/options/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/options/test
rename to sbt/src/sbt-test/java/options/test
diff --git a/sbt_pending/src/sbt-test/java/scala-library/project/build.properties b/sbt/src/sbt-test/java/scala-library/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/scala-library/project/build.properties
rename to sbt/src/sbt-test/java/scala-library/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/scala-library/src/main/java/test/R.java b/sbt/src/sbt-test/java/scala-library/src/main/java/test/R.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/scala-library/src/main/java/test/R.java
rename to sbt/src/sbt-test/java/scala-library/src/main/java/test/R.java
diff --git a/sbt_pending/src/sbt-test/java/scala-library/test b/sbt/src/sbt-test/java/scala-library/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/scala-library/test
rename to sbt/src/sbt-test/java/scala-library/test
diff --git a/sbt_pending/src/sbt-test/java/separate/project/build.properties b/sbt/src/sbt-test/java/separate/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/project/build.properties
rename to sbt/src/sbt-test/java/separate/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/separate/project/build/src/TestProject.scala b/sbt/src/sbt-test/java/separate/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/java/separate/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/java/separate/src/main/java/F.java b/sbt/src/sbt-test/java/separate/src/main/java/F.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/src/main/java/F.java
rename to sbt/src/sbt-test/java/separate/src/main/java/F.java
diff --git a/sbt_pending/src/sbt-test/java/separate/src/main/scala/Dual.scala b/sbt/src/sbt-test/java/separate/src/main/scala/Dual.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/src/main/scala/Dual.scala
rename to sbt/src/sbt-test/java/separate/src/main/scala/Dual.scala
diff --git a/sbt_pending/src/sbt-test/java/separate/src/main/scala/FImpl.scala b/sbt/src/sbt-test/java/separate/src/main/scala/FImpl.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/src/main/scala/FImpl.scala
rename to sbt/src/sbt-test/java/separate/src/main/scala/FImpl.scala
diff --git a/sbt_pending/src/sbt-test/java/separate/test b/sbt/src/sbt-test/java/separate/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/separate/test
rename to sbt/src/sbt-test/java/separate/test
diff --git a/sbt_pending/src/sbt-test/java/track-anonymous/changes/Anon.java b/sbt/src/sbt-test/java/track-anonymous/changes/Anon.java
similarity index 100%
rename from sbt_pending/src/sbt-test/java/track-anonymous/changes/Anon.java
rename to sbt/src/sbt-test/java/track-anonymous/changes/Anon.java
diff --git a/sbt_pending/src/sbt-test/java/track-anonymous/project/build.properties b/sbt/src/sbt-test/java/track-anonymous/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/java/track-anonymous/project/build.properties
rename to sbt/src/sbt-test/java/track-anonymous/project/build.properties
diff --git a/sbt_pending/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala b/sbt/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
rename to sbt/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
diff --git a/sbt_pending/src/sbt-test/java/track-anonymous/test b/sbt/src/sbt-test/java/track-anonymous/test
similarity index 100%
rename from sbt_pending/src/sbt-test/java/track-anonymous/test
rename to sbt/src/sbt-test/java/track-anonymous/test
diff --git a/sbt_pending/src/sbt-test/package/lazy-name/project/build.properties b/sbt/src/sbt-test/package/lazy-name/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/package/lazy-name/project/build.properties
rename to sbt/src/sbt-test/package/lazy-name/project/build.properties
diff --git a/sbt_pending/src/sbt-test/package/lazy-name/project/build/Test.scala b/sbt/src/sbt-test/package/lazy-name/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/package/lazy-name/project/build/Test.scala
rename to sbt/src/sbt-test/package/lazy-name/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/package/lazy-name/test b/sbt/src/sbt-test/package/lazy-name/test
similarity index 100%
rename from sbt_pending/src/sbt-test/package/lazy-name/test
rename to sbt/src/sbt-test/package/lazy-name/test
diff --git a/sbt_pending/src/sbt-test/package/manifest/project/build.properties b/sbt/src/sbt-test/package/manifest/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/package/manifest/project/build.properties
rename to sbt/src/sbt-test/package/manifest/project/build.properties
diff --git a/sbt_pending/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala b/sbt/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
rename to sbt/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
diff --git a/sbt_pending/src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala b/sbt/src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala
rename to sbt/src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala
diff --git a/sbt_pending/src/sbt-test/package/manifest/test b/sbt/src/sbt-test/package/manifest/test
similarity index 100%
rename from sbt_pending/src/sbt-test/package/manifest/test
rename to sbt/src/sbt-test/package/manifest/test
diff --git a/sbt_pending/src/sbt-test/package/resources/project/build.properties b/sbt/src/sbt-test/package/resources/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/package/resources/project/build.properties
rename to sbt/src/sbt-test/package/resources/project/build.properties
diff --git a/sbt_pending/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala b/sbt/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
rename to sbt/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
diff --git a/sbt_pending/src/sbt-test/package/resources/src/main/resources/main_resource_test b/sbt/src/sbt-test/package/resources/src/main/resources/main_resource_test
similarity index 100%
rename from sbt_pending/src/sbt-test/package/resources/src/main/resources/main_resource_test
rename to sbt/src/sbt-test/package/resources/src/main/resources/main_resource_test
diff --git a/sbt_pending/src/sbt-test/package/resources/src/main/scala/jartest/Main.scala b/sbt/src/sbt-test/package/resources/src/main/scala/jartest/Main.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/package/resources/src/main/scala/jartest/Main.scala
rename to sbt/src/sbt-test/package/resources/src/main/scala/jartest/Main.scala
diff --git a/sbt_pending/src/sbt-test/package/resources/test b/sbt/src/sbt-test/package/resources/test
similarity index 100%
rename from sbt_pending/src/sbt-test/package/resources/test
rename to sbt/src/sbt-test/package/resources/test
diff --git a/sbt_pending/src/sbt-test/project/Class.forName/changes/LibTestProject.scala b/sbt/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
rename to sbt/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
diff --git a/sbt_pending/src/sbt-test/project/Class.forName/project/build.properties b/sbt/src/sbt-test/project/Class.forName/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/Class.forName/project/build.properties
rename to sbt/src/sbt-test/project/Class.forName/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala b/sbt/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
rename to sbt/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
diff --git a/sbt_pending/src/sbt-test/project/Class.forName/src/main/scala/Test.scala b/sbt/src/sbt-test/project/Class.forName/src/main/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/Class.forName/src/main/scala/Test.scala
rename to sbt/src/sbt-test/project/Class.forName/src/main/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/project/Class.forName/test b/sbt/src/sbt-test/project/Class.forName/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/Class.forName/test
rename to sbt/src/sbt-test/project/Class.forName/test
diff --git a/sbt_pending/src/sbt-test/project/console/project/build.properties b/sbt/src/sbt-test/project/console/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/console/project/build.properties
rename to sbt/src/sbt-test/project/console/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/console/project/build/P.scala b/sbt/src/sbt-test/project/console/project/build/P.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/console/project/build/P.scala
rename to sbt/src/sbt-test/project/console/project/build/P.scala
diff --git a/sbt_pending/src/sbt-test/project/console/sub1/project/build/TestSub.scala b/sbt/src/sbt-test/project/console/sub1/project/build/TestSub.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/console/sub1/project/build/TestSub.scala
rename to sbt/src/sbt-test/project/console/sub1/project/build/TestSub.scala
diff --git a/sbt_pending/src/sbt-test/project/console/test b/sbt/src/sbt-test/project/console/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/console/test
rename to sbt/src/sbt-test/project/console/test
diff --git a/sbt_pending/src/sbt-test/project/continuations/project/build.properties b/sbt/src/sbt-test/project/continuations/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/continuations/project/build.properties
rename to sbt/src/sbt-test/project/continuations/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/continuations/project/build/Continutations.scala b/sbt/src/sbt-test/project/continuations/project/build/Continutations.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/continuations/project/build/Continutations.scala
rename to sbt/src/sbt-test/project/continuations/project/build/Continutations.scala
diff --git a/sbt_pending/src/sbt-test/project/continuations/src/main/scala/Example.scala b/sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/continuations/src/main/scala/Example.scala
rename to sbt/src/sbt-test/project/continuations/src/main/scala/Example.scala
diff --git a/sbt_pending/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala b/sbt/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala
rename to sbt/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala
diff --git a/sbt_pending/src/sbt-test/project/continuations/test b/sbt/src/sbt-test/project/continuations/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/continuations/test
rename to sbt/src/sbt-test/project/continuations/test
diff --git a/sbt_pending/src/sbt-test/project/extra-environment/changes/first.properties b/sbt/src/sbt-test/project/extra-environment/changes/first.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/extra-environment/changes/first.properties
rename to sbt/src/sbt-test/project/extra-environment/changes/first.properties
diff --git a/sbt_pending/src/sbt-test/project/extra-environment/changes/second.properties b/sbt/src/sbt-test/project/extra-environment/changes/second.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/extra-environment/changes/second.properties
rename to sbt/src/sbt-test/project/extra-environment/changes/second.properties
diff --git a/sbt_pending/src/sbt-test/project/extra-environment/project/build.properties b/sbt/src/sbt-test/project/extra-environment/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/extra-environment/project/build.properties
rename to sbt/src/sbt-test/project/extra-environment/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/extra-environment/project/build/Test.scala b/sbt/src/sbt-test/project/extra-environment/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/extra-environment/project/build/Test.scala
rename to sbt/src/sbt-test/project/extra-environment/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/project/extra-environment/test b/sbt/src/sbt-test/project/extra-environment/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/extra-environment/test
rename to sbt/src/sbt-test/project/extra-environment/test
diff --git a/sbt_pending/src/sbt-test/project/flatten/project/build.properties b/sbt/src/sbt-test/project/flatten/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/project/build.properties
rename to sbt/src/sbt-test/project/flatten/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/flatten/project/build/src/FlatProject.scala b/sbt/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
rename to sbt/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/JavaA.java b/sbt/src/sbt-test/project/flatten/src/JavaA.java
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/JavaA.java
rename to sbt/src/sbt-test/project/flatten/src/JavaA.java
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/ScalaA.scala b/sbt/src/sbt-test/project/flatten/src/ScalaA.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/ScalaA.scala
rename to sbt/src/sbt-test/project/flatten/src/ScalaA.scala
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/a/JavaB.java b/sbt/src/sbt-test/project/flatten/src/a/JavaB.java
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/a/JavaB.java
rename to sbt/src/sbt-test/project/flatten/src/a/JavaB.java
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/a/ScalaB.scala b/sbt/src/sbt-test/project/flatten/src/a/ScalaB.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/a/ScalaB.scala
rename to sbt/src/sbt-test/project/flatten/src/a/ScalaB.scala
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/a/test-resource-a b/sbt/src/sbt-test/project/flatten/src/a/test-resource-a
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/a/test-resource-a
rename to sbt/src/sbt-test/project/flatten/src/a/test-resource-a
diff --git a/sbt_pending/src/sbt-test/project/flatten/src/test-resource b/sbt/src/sbt-test/project/flatten/src/test-resource
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/src/test-resource
rename to sbt/src/sbt-test/project/flatten/src/test-resource
diff --git a/sbt_pending/src/sbt-test/project/flatten/test b/sbt/src/sbt-test/project/flatten/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/test
rename to sbt/src/sbt-test/project/flatten/test
diff --git a/sbt_pending/src/sbt-test/project/flatten/test-src/SimpleTest.scala b/sbt/src/sbt-test/project/flatten/test-src/SimpleTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/test-src/SimpleTest.scala
rename to sbt/src/sbt-test/project/flatten/test-src/SimpleTest.scala
diff --git a/sbt_pending/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala b/sbt/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
rename to sbt/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
diff --git a/sbt_pending/src/sbt-test/project/flatten/test-src/c/test-resource-c b/sbt/src/sbt-test/project/flatten/test-src/c/test-resource-c
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/test-src/c/test-resource-c
rename to sbt/src/sbt-test/project/flatten/test-src/c/test-resource-c
diff --git a/sbt_pending/src/sbt-test/project/flatten/test-src/test-resource b/sbt/src/sbt-test/project/flatten/test-src/test-resource
similarity index 100%
rename from sbt_pending/src/sbt-test/project/flatten/test-src/test-resource
rename to sbt/src/sbt-test/project/flatten/test-src/test-resource
diff --git a/sbt_pending/src/sbt-test/project/lib/changes/LibTestProject.scala b/sbt/src/sbt-test/project/lib/changes/LibTestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/lib/changes/LibTestProject.scala
rename to sbt/src/sbt-test/project/lib/changes/LibTestProject.scala
diff --git a/sbt_pending/src/sbt-test/project/lib/project/build.properties b/sbt/src/sbt-test/project/lib/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/lib/project/build.properties
rename to sbt/src/sbt-test/project/lib/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/lib/project/build/Test.scala b/sbt/src/sbt-test/project/lib/project/build/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/lib/project/build/Test.scala
rename to sbt/src/sbt-test/project/lib/project/build/Test.scala
diff --git a/sbt_pending/src/sbt-test/project/lib/src/main/scala/Test.scala b/sbt/src/sbt-test/project/lib/src/main/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/lib/src/main/scala/Test.scala
rename to sbt/src/sbt-test/project/lib/src/main/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/project/lib/test b/sbt/src/sbt-test/project/lib/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/lib/test
rename to sbt/src/sbt-test/project/lib/test
diff --git a/sbt_pending/src/sbt-test/project/multi/changes/MultiProject.scala b/sbt/src/sbt-test/project/multi/changes/MultiProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/changes/MultiProject.scala
rename to sbt/src/sbt-test/project/multi/changes/MultiProject.scala
diff --git a/sbt_pending/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala b/sbt/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
rename to sbt/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
diff --git a/sbt_pending/src/sbt-test/project/multi/changes/SingleProject.scala b/sbt/src/sbt-test/project/multi/changes/SingleProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/changes/SingleProject.scala
rename to sbt/src/sbt-test/project/multi/changes/SingleProject.scala
diff --git a/sbt_pending/src/sbt-test/project/multi/changes/SinglePublicProject.scala b/sbt/src/sbt-test/project/multi/changes/SinglePublicProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/changes/SinglePublicProject.scala
rename to sbt/src/sbt-test/project/multi/changes/SinglePublicProject.scala
diff --git a/sbt_pending/src/sbt-test/project/multi/project/build.properties b/sbt/src/sbt-test/project/multi/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/project/build.properties
rename to sbt/src/sbt-test/project/multi/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/multi/test b/sbt/src/sbt-test/project/multi/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/multi/test
rename to sbt/src/sbt-test/project/multi/test
diff --git a/sbt_pending/src/sbt-test/project/plugins/project/build.properties b/sbt/src/sbt-test/project/plugins/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/plugins/project/build.properties
rename to sbt/src/sbt-test/project/plugins/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/plugins/project/build/UsePlugin.scala b/sbt/src/sbt-test/project/plugins/project/build/UsePlugin.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/plugins/project/build/UsePlugin.scala
rename to sbt/src/sbt-test/project/plugins/project/build/UsePlugin.scala
diff --git a/sbt_pending/src/sbt-test/project/plugins/project/plugins/Plugins.scala b/sbt/src/sbt-test/project/plugins/project/plugins/Plugins.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/plugins/project/plugins/Plugins.scala
rename to sbt/src/sbt-test/project/plugins/project/plugins/Plugins.scala
diff --git a/sbt_pending/src/sbt-test/project/plugins/test b/sbt/src/sbt-test/project/plugins/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/plugins/test
rename to sbt/src/sbt-test/project/plugins/test
diff --git a/sbt_pending/src/sbt-test/project/processor/project/build.properties b/sbt/src/sbt-test/project/processor/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/processor/project/build.properties
rename to sbt/src/sbt-test/project/processor/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/processor/project/build/ProcessorProject.scala b/sbt/src/sbt-test/project/processor/project/build/ProcessorProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/processor/project/build/ProcessorProject.scala
rename to sbt/src/sbt-test/project/processor/project/build/ProcessorProject.scala
diff --git a/sbt_pending/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala b/sbt/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
rename to sbt/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
diff --git a/sbt_pending/src/sbt-test/project/processor/test b/sbt/src/sbt-test/project/processor/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/processor/test
rename to sbt/src/sbt-test/project/processor/test
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/changes/JavaTest.java b/sbt/src/sbt-test/project/src-plugins/changes/JavaTest.java
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/changes/JavaTest.java
rename to sbt/src/sbt-test/project/src-plugins/changes/JavaTest.java
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/changes/Plugins.scala b/sbt/src/sbt-test/project/src-plugins/changes/Plugins.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/changes/Plugins.scala
rename to sbt/src/sbt-test/project/src-plugins/changes/Plugins.scala
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/changes/TestPlugin.scala b/sbt/src/sbt-test/project/src-plugins/changes/TestPlugin.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/changes/TestPlugin.scala
rename to sbt/src/sbt-test/project/src-plugins/changes/TestPlugin.scala
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/changes/UsePlugin.scala b/sbt/src/sbt-test/project/src-plugins/changes/UsePlugin.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/changes/UsePlugin.scala
rename to sbt/src/sbt-test/project/src-plugins/changes/UsePlugin.scala
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/project/build.properties b/sbt/src/sbt-test/project/src-plugins/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/project/build.properties
rename to sbt/src/sbt-test/project/src-plugins/project/build.properties
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala b/sbt/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
rename to sbt/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
diff --git a/sbt_pending/src/sbt-test/project/src-plugins/test b/sbt/src/sbt-test/project/src-plugins/test
similarity index 100%
rename from sbt_pending/src/sbt-test/project/src-plugins/test
rename to sbt/src/sbt-test/project/src-plugins/test
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-a/project/build.properties b/sbt/src/sbt-test/properties/multi-project-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-a/project/build.properties
rename to sbt/src/sbt-test/properties/multi-project-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala b/sbt/src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-a/test b/sbt/src/sbt-test/properties/multi-project-a/test
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-a/test
rename to sbt/src/sbt-test/properties/multi-project-a/test
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-b/project/build.properties b/sbt/src/sbt-test/properties/multi-project-b/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-b/project/build.properties
rename to sbt/src/sbt-test/properties/multi-project-b/project/build.properties
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala b/sbt/src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala
rename to sbt/src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/properties/multi-project-b/test b/sbt/src/sbt-test/properties/multi-project-b/test
similarity index 100%
rename from sbt_pending/src/sbt-test/properties/multi-project-b/test
rename to sbt/src/sbt-test/properties/multi-project-b/test
diff --git a/sbt_pending/src/sbt-test/run/ForkFail/project/build.properties b/sbt/src/sbt-test/run/ForkFail/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/ForkFail/project/build.properties
rename to sbt/src/sbt-test/run/ForkFail/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala b/sbt/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
rename to sbt/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
diff --git a/sbt_pending/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala b/sbt/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
rename to sbt/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
diff --git a/sbt_pending/src/sbt-test/run/ForkFail/test b/sbt/src/sbt-test/run/ForkFail/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/ForkFail/test
rename to sbt/src/sbt-test/run/ForkFail/test
diff --git a/sbt_pending/src/sbt-test/run/console-project/changes/BlankProject.scala b/sbt/src/sbt-test/run/console-project/changes/BlankProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/console-project/changes/BlankProject.scala
rename to sbt/src/sbt-test/run/console-project/changes/BlankProject.scala
diff --git a/sbt_pending/src/sbt-test/run/console-project/project/build.properties b/sbt/src/sbt-test/run/console-project/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/console-project/project/build.properties
rename to sbt/src/sbt-test/run/console-project/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/console-project/test b/sbt/src/sbt-test/run/console-project/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/console-project/test
rename to sbt/src/sbt-test/run/console-project/test
diff --git a/sbt_pending/src/sbt-test/run/daemon-exit/project/build.properties b/sbt/src/sbt-test/run/daemon-exit/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon-exit/project/build.properties
rename to sbt/src/sbt-test/run/daemon-exit/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala b/sbt/src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala
rename to sbt/src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala
diff --git a/sbt_pending/src/sbt-test/run/daemon-exit/test b/sbt/src/sbt-test/run/daemon-exit/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon-exit/test
rename to sbt/src/sbt-test/run/daemon-exit/test
diff --git a/sbt_pending/src/sbt-test/run/daemon/project/build.properties b/sbt/src/sbt-test/run/daemon/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon/project/build.properties
rename to sbt/src/sbt-test/run/daemon/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/daemon/src/main/scala/Daemon.scala b/sbt/src/sbt-test/run/daemon/src/main/scala/Daemon.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon/src/main/scala/Daemon.scala
rename to sbt/src/sbt-test/run/daemon/src/main/scala/Daemon.scala
diff --git a/sbt_pending/src/sbt-test/run/daemon/test b/sbt/src/sbt-test/run/daemon/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/daemon/test
rename to sbt/src/sbt-test/run/daemon/test
diff --git a/sbt_pending/src/sbt-test/run/error/changes/RunExplicitFailure.scala b/sbt/src/sbt-test/run/error/changes/RunExplicitFailure.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/changes/RunExplicitFailure.scala
rename to sbt/src/sbt-test/run/error/changes/RunExplicitFailure.scala
diff --git a/sbt_pending/src/sbt-test/run/error/changes/RunExplicitSuccess.scala b/sbt/src/sbt-test/run/error/changes/RunExplicitSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/changes/RunExplicitSuccess.scala
rename to sbt/src/sbt-test/run/error/changes/RunExplicitSuccess.scala
diff --git a/sbt_pending/src/sbt-test/run/error/changes/RunFailureMain.scala b/sbt/src/sbt-test/run/error/changes/RunFailureMain.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/changes/RunFailureMain.scala
rename to sbt/src/sbt-test/run/error/changes/RunFailureMain.scala
diff --git a/sbt_pending/src/sbt-test/run/error/changes/RunSuccess.scala b/sbt/src/sbt-test/run/error/changes/RunSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/changes/RunSuccess.scala
rename to sbt/src/sbt-test/run/error/changes/RunSuccess.scala
diff --git a/sbt_pending/src/sbt-test/run/error/changes/ThreadRunError.scala b/sbt/src/sbt-test/run/error/changes/ThreadRunError.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/changes/ThreadRunError.scala
rename to sbt/src/sbt-test/run/error/changes/ThreadRunError.scala
diff --git a/sbt_pending/src/sbt-test/run/error/project/build.properties b/sbt/src/sbt-test/run/error/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/project/build.properties
rename to sbt/src/sbt-test/run/error/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/error/test b/sbt/src/sbt-test/run/error/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/error/test
rename to sbt/src/sbt-test/run/error/test
diff --git a/sbt_pending/src/sbt-test/run/spawn-exit/project/build.properties b/sbt/src/sbt-test/run/spawn-exit/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn-exit/project/build.properties
rename to sbt/src/sbt-test/run/spawn-exit/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala b/sbt/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala
rename to sbt/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala
diff --git a/sbt_pending/src/sbt-test/run/spawn-exit/test b/sbt/src/sbt-test/run/spawn-exit/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn-exit/test
rename to sbt/src/sbt-test/run/spawn-exit/test
diff --git a/sbt_pending/src/sbt-test/run/spawn/project/build.properties b/sbt/src/sbt-test/run/spawn/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn/project/build.properties
rename to sbt/src/sbt-test/run/spawn/project/build.properties
diff --git a/sbt_pending/src/sbt-test/run/spawn/src/main/scala/Spawn.scala b/sbt/src/sbt-test/run/spawn/src/main/scala/Spawn.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn/src/main/scala/Spawn.scala
rename to sbt/src/sbt-test/run/spawn/src/main/scala/Spawn.scala
diff --git a/sbt_pending/src/sbt-test/run/spawn/test b/sbt/src/sbt-test/run/spawn/test
similarity index 100%
rename from sbt_pending/src/sbt-test/run/spawn/test
rename to sbt/src/sbt-test/run/spawn/test
diff --git a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/A.scala b/sbt/src/sbt-test/source-dependencies/abstract-type/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/abstract-type/A.scala
rename to sbt/src/sbt-test/source-dependencies/abstract-type/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/B.scala b/sbt/src/sbt-test/source-dependencies/abstract-type/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/abstract-type/B.scala
rename to sbt/src/sbt-test/source-dependencies/abstract-type/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt/src/sbt-test/source-dependencies/abstract-type/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/abstract-type/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/abstract-type/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/project/build.properties b/sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/abstract-type/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/test b/sbt/src/sbt-test/source-dependencies/abstract-type/test
similarity index 86%
rename from sbt_pending/src/sbt-test/source-dependencies/abstract-type/test
rename to sbt/src/sbt-test/source-dependencies/abstract-type/test
index a5dd8502d..3f5a5c7e3 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/abstract-type/test
+++ b/sbt/src/sbt-test/source-dependencies/abstract-type/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # remove type arguments from S
 $ copy-file changes/A.scala A.scala
 
 # Both A.scala and B.scala should be recompiled, producing a compile error
--> +compile
\ No newline at end of file
+-> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/added/changes/A1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/changes/A1.scala
rename to sbt/src/sbt-test/source-dependencies/added/changes/A1.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/added/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/added/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/changes/A3.scala b/sbt/src/sbt-test/source-dependencies/added/changes/A3.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/changes/A3.scala
rename to sbt/src/sbt-test/source-dependencies/added/changes/A3.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/changes/B1.scala b/sbt/src/sbt-test/source-dependencies/added/changes/B1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/changes/B1.scala
rename to sbt/src/sbt-test/source-dependencies/added/changes/B1.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/changes/B2.scala b/sbt/src/sbt-test/source-dependencies/added/changes/B2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/changes/B2.scala
rename to sbt/src/sbt-test/source-dependencies/added/changes/B2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/project/build.properties b/sbt/src/sbt-test/source-dependencies/added/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/added/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/added/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/added/test b/sbt/src/sbt-test/source-dependencies/added/test
similarity index 93%
rename from sbt_pending/src/sbt-test/source-dependencies/added/test
rename to sbt/src/sbt-test/source-dependencies/added/test
index 4f85e4288..a1ab31849 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/added/test
+++ b/sbt/src/sbt-test/source-dependencies/added/test
@@ -4,25 +4,25 @@
 # B and A are independent, so both should compile successfully
 $ copy-file changes/A1.scala src/main/scala/A.scala
 $ copy-file changes/B1.scala src/main/scala/B.scala
-> +compile
+> compile
 
 
 # A now depends on B and to check that it was recompiled, we mismatch the types, which should fail
 $ copy-file changes/A2.scala src/main/scala/A.scala
--> +compile
+-> compile
 
 
 # We now correct the type so that it compiles successfully and this should introduce a dependency from A to B
 $ copy-file changes/A3.scala src/main/scala/A.scala
-> +compile
+> compile
 
 
 # If the dependency from A to B was properly introduced, changing the type of B.y to Int should make
 # the following statement in A a compiler error:
 #   val x: String = B.y
 $ copy-file changes/B2.scala src/main/scala/B.scala
--> +compile
+-> compile
 
 # verify this was the correct result by doing a clean+compile
-> +clean
--> +compile
\ No newline at end of file
+> clean
+-> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/by-name/A.scala b/sbt/src/sbt-test/source-dependencies/by-name/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/by-name/A.scala
rename to sbt/src/sbt-test/source-dependencies/by-name/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/by-name/B.scala b/sbt/src/sbt-test/source-dependencies/by-name/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/by-name/B.scala
rename to sbt/src/sbt-test/source-dependencies/by-name/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt/src/sbt-test/source-dependencies/by-name/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/by-name/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/by-name/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/by-name/project/build.properties b/sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/by-name/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/by-name/test b/sbt/src/sbt-test/source-dependencies/by-name/test
similarity index 86%
rename from sbt_pending/src/sbt-test/source-dependencies/by-name/test
rename to sbt/src/sbt-test/source-dependencies/by-name/test
index 0d39f0383..4306d3bcc 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/by-name/test
+++ b/sbt/src/sbt-test/source-dependencies/by-name/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # change => Int to Function0
 $ copy-file changes/A.scala A.scala
 
 # Both A.scala and B.scala need to be recompiled because the type has changed
--> +compile
\ No newline at end of file
+-> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/compactify/project/build.properties b/sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/compactify/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala b/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
new file mode 100644
index 000000000..3e2dd3117
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class CompactifyTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	def classes = (outputDirectory ** "*.class").get
+	lazy val outputEmpty = task { if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t")) }
+}
diff --git a/sbt_pending/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
rename to sbt/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
rename to sbt/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/compactify/test b/sbt/src/sbt-test/source-dependencies/compactify/test
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/compactify/test
rename to sbt/src/sbt-test/source-dependencies/compactify/test
diff --git a/sbt_pending/src/sbt-test/source-dependencies/default-params/A.scala b/sbt/src/sbt-test/source-dependencies/default-params/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/default-params/A.scala
rename to sbt/src/sbt-test/source-dependencies/default-params/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/default-params/B.scala b/sbt/src/sbt-test/source-dependencies/default-params/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/default-params/B.scala
rename to sbt/src/sbt-test/source-dependencies/default-params/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt/src/sbt-test/source-dependencies/default-params/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/default-params/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/default-params/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/default-params/project/build.properties b/sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/default-params/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/default-params/test b/sbt/src/sbt-test/source-dependencies/default-params/test
similarity index 83%
rename from sbt_pending/src/sbt-test/source-dependencies/default-params/test
rename to sbt/src/sbt-test/source-dependencies/default-params/test
index 32defd9a8..1e674f8f6 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/default-params/test
+++ b/sbt/src/sbt-test/source-dependencies/default-params/test
@@ -1,5 +1,3 @@
-# default parameters are only in 2.8
-> ++2.8.0.Beta1-RC7
 > compile
 
 # switch which 'x' method has a default for the second parameter in A
@@ -8,4 +6,4 @@ $ copy-file changes/A.scala A.scala
 
 # Both A.scala and B.scala need to be recompiled because the parameter needs to be explicitly provided
 # and it should be a compile error
--> compile
\ No newline at end of file
+-> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt/src/sbt-test/source-dependencies/empty-a/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/empty-a/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/empty-a/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/empty-a/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt/src/sbt-test/source-dependencies/empty-a/changes/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/empty-a/changes/B.scala
rename to sbt/src/sbt-test/source-dependencies/empty-a/changes/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/empty-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/empty-a/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/empty-a/test b/sbt/src/sbt-test/source-dependencies/empty-a/test
similarity index 85%
rename from sbt_pending/src/sbt-test/source-dependencies/empty-a/test
rename to sbt/src/sbt-test/source-dependencies/empty-a/test
index ecba8ad1a..d0f0b25a8 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/empty-a/test
+++ b/sbt/src/sbt-test/source-dependencies/empty-a/test
@@ -1,19 +1,19 @@
 $ copy-file changes/A.scala src/main/scala/A.scala
-> +compile
+> compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-> +compile
+> compile
 
 $ copy-file changes/B.scala src/main/scala/B.scala
--> +compile
+-> compile
 
 $ copy-file changes/A.scala src/main/scala/A.scala
-> +compile
+> compile
 
 $ delete src/main/scala/B.scala
 $ copy-file changes/A2.scala src/main/scala/A.scala
-> +compile
+> compile
 
 $ copy-file changes/A.scala src/main/scala/A.scala
 $ copy-file changes/B.scala src/main/scala/B.scala
-> +compile
\ No newline at end of file
+> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/erasure/A.scala b/sbt/src/sbt-test/source-dependencies/erasure/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/erasure/A.scala
rename to sbt/src/sbt-test/source-dependencies/erasure/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/erasure/B.scala b/sbt/src/sbt-test/source-dependencies/erasure/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/erasure/B.scala
rename to sbt/src/sbt-test/source-dependencies/erasure/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt/src/sbt-test/source-dependencies/erasure/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/erasure/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/erasure/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/erasure/project/build.properties b/sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/erasure/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/erasure/test b/sbt/src/sbt-test/source-dependencies/erasure/test
similarity index 62%
rename from sbt_pending/src/sbt-test/source-dependencies/erasure/test
rename to sbt/src/sbt-test/source-dependencies/erasure/test
index 30a932d1b..aaca5a2e3 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/erasure/test
+++ b/sbt/src/sbt-test/source-dependencies/erasure/test
@@ -1,4 +1,4 @@
-> +compile
+> compile
 
 $ copy-file changes/A.scala A.scala
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/false-error/A.scala b/sbt/src/sbt-test/source-dependencies/false-error/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/false-error/A.scala
rename to sbt/src/sbt-test/source-dependencies/false-error/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/false-error/B.scala b/sbt/src/sbt-test/source-dependencies/false-error/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/false-error/B.scala
rename to sbt/src/sbt-test/source-dependencies/false-error/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt/src/sbt-test/source-dependencies/false-error/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/false-error/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/false-error/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/false-error/project/build.properties b/sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/false-error/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/false-error/test b/sbt/src/sbt-test/source-dependencies/false-error/test
similarity index 63%
rename from sbt_pending/src/sbt-test/source-dependencies/false-error/test
rename to sbt/src/sbt-test/source-dependencies/false-error/test
index aac00c6b9..80c8ec9bf 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/false-error/test
+++ b/sbt/src/sbt-test/source-dependencies/false-error/test
@@ -1,5 +1,5 @@
-> +compile
+> compile
 
 $ copy-file changes/A.scala A.scala
 
-> +compile
+> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/A.scala b/sbt/src/sbt-test/source-dependencies/implicit-params/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit-params/A.scala
rename to sbt/src/sbt-test/source-dependencies/implicit-params/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/B.scala b/sbt/src/sbt-test/source-dependencies/implicit-params/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit-params/B.scala
rename to sbt/src/sbt-test/source-dependencies/implicit-params/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt/src/sbt-test/source-dependencies/implicit-params/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit-params/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/implicit-params/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/project/build.properties b/sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit-params/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/test b/sbt/src/sbt-test/source-dependencies/implicit-params/test
similarity index 90%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit-params/test
rename to sbt/src/sbt-test/source-dependencies/implicit-params/test
index 5b0be8a77..5a2bcc0f4 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/implicit-params/test
+++ b/sbt/src/sbt-test/source-dependencies/implicit-params/test
@@ -1,8 +1,8 @@
-> +compile
+> compile
 
 # make implicit parameters in A.x be explicit
 $ copy-file changes/A.scala A.scala
 
 # Both A.scala and B.scala need to be recompiled because the parameter section is no longer implicit
 # and it should be a compile error
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit/A.scala b/sbt/src/sbt-test/source-dependencies/implicit/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit/A.scala
rename to sbt/src/sbt-test/source-dependencies/implicit/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit/B.scala b/sbt/src/sbt-test/source-dependencies/implicit/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit/B.scala
rename to sbt/src/sbt-test/source-dependencies/implicit/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt/src/sbt-test/source-dependencies/implicit/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/implicit/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit/project/build.properties b/sbt/src/sbt-test/source-dependencies/implicit/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/implicit/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/implicit/test b/sbt/src/sbt-test/source-dependencies/implicit/test
similarity index 87%
rename from sbt_pending/src/sbt-test/source-dependencies/implicit/test
rename to sbt/src/sbt-test/source-dependencies/implicit/test
index 57d694872..73aaab1d9 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/implicit/test
+++ b/sbt/src/sbt-test/source-dependencies/implicit/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # change A.x to be implicit
 $ copy-file changes/A.scala A.scala
 
 # Both A.scala and B.scala need to be recompiled because a new implicit is available
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/import/A.scala b/sbt/src/sbt-test/source-dependencies/import/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/import/A.scala
rename to sbt/src/sbt-test/source-dependencies/import/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/import/B.scala b/sbt/src/sbt-test/source-dependencies/import/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/import/B.scala
rename to sbt/src/sbt-test/source-dependencies/import/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/import/changes/A.scala b/sbt/src/sbt-test/source-dependencies/import/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/import/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/import/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/import/project/build.properties b/sbt/src/sbt-test/source-dependencies/import/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/import/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/import/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/import/test b/sbt/src/sbt-test/source-dependencies/import/test
similarity index 89%
rename from sbt_pending/src/sbt-test/source-dependencies/import/test
rename to sbt/src/sbt-test/source-dependencies/import/test
index 393bdb6a7..8837c77c5 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/import/test
+++ b/sbt/src/sbt-test/source-dependencies/import/test
@@ -1,8 +1,8 @@
-> +compile
+> compile
 
 # shorten the package defined in A from 'a.b' to 'a'.
 $ copy-file changes/A.scala A.scala
 
 # 'import a.b' should now fail in B.scala
 # disabled because scalac doesn't track this dependency
-#-> +compile
\ No newline at end of file
+#-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt/src/sbt-test/source-dependencies/intermediate-error/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/A.scala
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt/src/sbt-test/source-dependencies/intermediate-error/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/B.scala
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/project/build.properties b/sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/test b/sbt/src/sbt-test/source-dependencies/intermediate-error/test
similarity index 69%
rename from sbt_pending/src/sbt-test/source-dependencies/intermediate-error/test
rename to sbt/src/sbt-test/source-dependencies/intermediate-error/test
index 64cf407c5..e3016a9c6 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/intermediate-error/test
+++ b/sbt/src/sbt-test/source-dependencies/intermediate-error/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 $ copy-file changes/A2.scala A.scala
--> +compile
+-> compile
 
 $ copy-file changes/A3.scala A.scala
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt/src/sbt-test/source-dependencies/java-basic/changes/A.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/A.java
rename to sbt/src/sbt-test/source-dependencies/java-basic/changes/A.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt/src/sbt-test/source-dependencies/java-basic/changes/A2.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/A2.java
rename to sbt/src/sbt-test/source-dependencies/java-basic/changes/A2.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt/src/sbt-test/source-dependencies/java-basic/changes/B1.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B1.java
rename to sbt/src/sbt-test/source-dependencies/java-basic/changes/B1.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt/src/sbt-test/source-dependencies/java-basic/changes/B2.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B2.java
rename to sbt/src/sbt-test/source-dependencies/java-basic/changes/B2.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt/src/sbt-test/source-dependencies/java-basic/changes/B3.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/changes/B3.java
rename to sbt/src/sbt-test/source-dependencies/java-basic/changes/B3.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/project/build.properties b/sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-basic/test b/sbt/src/sbt-test/source-dependencies/java-basic/test
similarity index 93%
rename from sbt_pending/src/sbt-test/source-dependencies/java-basic/test
rename to sbt/src/sbt-test/source-dependencies/java-basic/test
index 0dfee643f..ee62f0b85 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/java-basic/test
+++ b/sbt/src/sbt-test/source-dependencies/java-basic/test
@@ -1,44 +1,45 @@
 # Basic test for Java dependency tracking
+> set xsbt.inc.debug true
 
 # A is a basic Java file with no dependencies.  Just a basic check for Java compilation
 $ copy-file changes/A.java src/main/java/a/A.java
-> +compile
+> compile
 
 # A2 is a basic Java file with no dependencies.  This is added to verify
 # that classes are properly mapped back to their source.
 # (There are two files named A.java now, one in a/ and one in a/b)
 $ copy-file changes/A2.java src/main/java/a/b/A.java
-> +compile
+> compile
 
 # This adds B, another basic Java file with no dependencies
 $ copy-file changes/B1.java src/main/java/a/b/B.java
-> +compile
+> compile
 
 # Now, modify B so that it depends on a.A
 # This ensures that dependencies on a source not included in the compilation
 # (a/A.java has not changed) are tracked
 $ copy-file changes/B2.java src/main/java/a/b/B.java
-> +compile
+> compile
 
 # Remove a.b.A and there should be no problem compiling, since B should
 # have recorded a dependency on a.A and not a.b.A
 $ delete src/main/java/a/b/A.java
-> +compile
+> compile
 
 # Remove a.A and B should be recompiled if the dependency on a.A was properly
 # recorded.  This should be a compile error, since we haven't updated B to not
 # depend on A
 $ delete src/main/java/a/A.java
--> +compile
+-> compile
 
 # Replace B with a new B that doesn't depend on a.A and so it should compile
 # It shouldn't run though, because it doesn't have a main method
 $ copy-file changes/B1.java src/main/java/a/b/B.java
-> +compile
--> +run
+> compile
+-> run
 
 
 # Replace B with a new B that has a main method and should therefore run
 # if the main method was properly detected
 $ copy-file changes/B3.java src/main/java/a/b/B.java
-> +run
\ No newline at end of file
+> run
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt/src/sbt-test/source-dependencies/java-static/changes/J1.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-static/changes/J1.java
rename to sbt/src/sbt-test/source-dependencies/java-static/changes/J1.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt/src/sbt-test/source-dependencies/java-static/changes/J2.java
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-static/changes/J2.java
rename to sbt/src/sbt-test/source-dependencies/java-static/changes/J2.java
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt/src/sbt-test/source-dependencies/java-static/changes/S.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-static/changes/S.scala
rename to sbt/src/sbt-test/source-dependencies/java-static/changes/S.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-static/project/build.properties b/sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/java-static/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/java-static/test b/sbt/src/sbt-test/source-dependencies/java-static/test
similarity index 94%
rename from sbt_pending/src/sbt-test/source-dependencies/java-static/test
rename to sbt/src/sbt-test/source-dependencies/java-static/test
index d75a1bfdc..42890ca74 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/java-static/test
+++ b/sbt/src/sbt-test/source-dependencies/java-static/test
@@ -9,16 +9,16 @@
 
 # add and compile the Java source
 $ copy-file changes/J1.java src/main/java/J.java
-> +compile
+> compile
 
 # add and compile the Scala source
 $ copy-file changes/S.scala src/main/scala/S.scala
-> +compile
+> compile
 
 # change the Java source so that a compile error should occur if S.scala is also recompiled (which will happen if the dependency was properly recorded)
 $ copy-file changes/J2.java src/main/java/J.java
--> +compile
+-> compile
 
 # verify it should have failed by doing a full recompilation
-> +clean
--> +compile
\ No newline at end of file
+> clean
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/A.scala b/sbt/src/sbt-test/source-dependencies/lazy-val/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/lazy-val/A.scala
rename to sbt/src/sbt-test/source-dependencies/lazy-val/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/B.scala b/sbt/src/sbt-test/source-dependencies/lazy-val/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/lazy-val/B.scala
rename to sbt/src/sbt-test/source-dependencies/lazy-val/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt/src/sbt-test/source-dependencies/lazy-val/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/lazy-val/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/lazy-val/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/project/build.properties b/sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/lazy-val/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/test b/sbt/src/sbt-test/source-dependencies/lazy-val/test
similarity index 76%
rename from sbt_pending/src/sbt-test/source-dependencies/lazy-val/test
rename to sbt/src/sbt-test/source-dependencies/lazy-val/test
index 5e9230e9c..f870aaef3 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/lazy-val/test
+++ b/sbt/src/sbt-test/source-dependencies/lazy-val/test
@@ -1,6 +1,6 @@
-> +compile
+> compile
 
 # replace val x with lazy val x
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/A.scala b/sbt/src/sbt-test/source-dependencies/linearization/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/A.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/B.scala b/sbt/src/sbt-test/source-dependencies/linearization/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/B.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/C.scala b/sbt/src/sbt-test/source-dependencies/linearization/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/C.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/D.scala b/sbt/src/sbt-test/source-dependencies/linearization/D.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/D.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/D.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/E.scala b/sbt/src/sbt-test/source-dependencies/linearization/E.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/E.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/E.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/F.scala b/sbt/src/sbt-test/source-dependencies/linearization/F.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/F.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/F.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt/src/sbt-test/source-dependencies/linearization/changes/D.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/changes/D.scala
rename to sbt/src/sbt-test/source-dependencies/linearization/changes/D.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/project/build.properties b/sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/linearization/test b/sbt/src/sbt-test/source-dependencies/linearization/test
similarity index 85%
rename from sbt_pending/src/sbt-test/source-dependencies/linearization/test
rename to sbt/src/sbt-test/source-dependencies/linearization/test
index 480962b6c..e6078ebfb 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/linearization/test
+++ b/sbt/src/sbt-test/source-dependencies/linearization/test
@@ -1,13 +1,13 @@
-> +compile
+> compile
 
 # the value of F.x should be 16
-> +run 16
+> run 16
 
 # modify D.scala so that the linearization changes
 $ copy-file changes/D.scala D.scala
 # F.x becomes 11
-> +compile
+> compile
 
 # if F is recompiled, the value of x should be 11, otherwise it will still be 16
 # and this will fail
-> +run 11
\ No newline at end of file
+> run 11
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/named/A.scala b/sbt/src/sbt-test/source-dependencies/named/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/named/A.scala
rename to sbt/src/sbt-test/source-dependencies/named/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/named/B.scala b/sbt/src/sbt-test/source-dependencies/named/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/named/B.scala
rename to sbt/src/sbt-test/source-dependencies/named/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/named/changes/A.scala b/sbt/src/sbt-test/source-dependencies/named/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/named/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/named/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/named/project/build.properties b/sbt/src/sbt-test/source-dependencies/named/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/named/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/named/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/named/test b/sbt/src/sbt-test/source-dependencies/named/test
similarity index 88%
rename from sbt_pending/src/sbt-test/source-dependencies/named/test
rename to sbt/src/sbt-test/source-dependencies/named/test
index 55cfc1486..28f1c58d3 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/named/test
+++ b/sbt/src/sbt-test/source-dependencies/named/test
@@ -1,5 +1,5 @@
 # named parameters are only in 2.8
-> ++2.8.0-SNAPSHOT
+#> ++2.8.0
 
 > compile
 
@@ -13,4 +13,4 @@ $ copy-file changes/A.scala A.scala
 > compile
 
 # Should still get 1 and not -1
-> run 1
\ No newline at end of file
+> run 1
diff --git a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/project/build.properties b/sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
rename to sbt/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
rename to sbt/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/test b/sbt/src/sbt-test/source-dependencies/new-cyclic/test
similarity index 70%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/test
rename to sbt/src/sbt-test/source-dependencies/new-cyclic/test
index a0889f9d8..82b078e7d 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/test
+++ b/sbt/src/sbt-test/source-dependencies/new-cyclic/test
@@ -1,4 +1,4 @@
-> +compile
+> compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
--> +compile
\ No newline at end of file
+-> compile
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/W.scala b/sbt/src/sbt-test/source-dependencies/parent-change/W.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/W.scala
rename to sbt/src/sbt-test/source-dependencies/parent-change/W.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/Y.scala b/sbt/src/sbt-test/source-dependencies/parent-change/Y.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/Y.scala
rename to sbt/src/sbt-test/source-dependencies/parent-change/Y.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/Z.scala b/sbt/src/sbt-test/source-dependencies/parent-change/Z.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/Z.scala
rename to sbt/src/sbt-test/source-dependencies/parent-change/Z.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt/src/sbt-test/source-dependencies/parent-change/changes/W.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/changes/W.scala
rename to sbt/src/sbt-test/source-dependencies/parent-change/changes/W.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-change/test b/sbt/src/sbt-test/source-dependencies/parent-change/test
similarity index 87%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-change/test
rename to sbt/src/sbt-test/source-dependencies/parent-change/test
index 5f45f4756..9a80ffae6 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/parent-change/test
+++ b/sbt/src/sbt-test/source-dependencies/parent-change/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # modify V to no longer extend W
 $ copy-file changes/W.scala W.scala
 
 # Should recompile Y.scala and report an error: "value x is not a member of Z"
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt/src/sbt-test/source-dependencies/parent-member-change/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/A.scala
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt/src/sbt-test/source-dependencies/parent-member-change/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/B.scala
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt/src/sbt-test/source-dependencies/parent-member-change/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/C.scala
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/test b/sbt/src/sbt-test/source-dependencies/parent-member-change/test
similarity index 91%
rename from sbt_pending/src/sbt-test/source-dependencies/parent-member-change/test
rename to sbt/src/sbt-test/source-dependencies/parent-member-change/test
index 6f4ce0df8..af7153b5f 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/parent-member-change/test
+++ b/sbt/src/sbt-test/source-dependencies/parent-member-change/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # modify A.scala so that the signature of its method changes to be identical to
 # that of the method in its descendent in C.scala
 $ copy-file changes/A.scala A.scala
 # Should recompile C.scala and report this error, failing the compile
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/A.scala b/sbt/src/sbt-test/source-dependencies/qualified-access/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/qualified-access/A.scala
rename to sbt/src/sbt-test/source-dependencies/qualified-access/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/B.scala b/sbt/src/sbt-test/source-dependencies/qualified-access/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/qualified-access/B.scala
rename to sbt/src/sbt-test/source-dependencies/qualified-access/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt/src/sbt-test/source-dependencies/qualified-access/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/qualified-access/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/qualified-access/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/project/build.properties b/sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/qualified-access/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/test b/sbt/src/sbt-test/source-dependencies/qualified-access/test
similarity index 87%
rename from sbt_pending/src/sbt-test/source-dependencies/qualified-access/test
rename to sbt/src/sbt-test/source-dependencies/qualified-access/test
index b368fc123..2cc575f6b 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/qualified-access/test
+++ b/sbt/src/sbt-test/source-dependencies/qualified-access/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # change access of A.x
 $ copy-file changes/A.scala A.scala
 
 # Should force recompilation of B.scala because access changed and B's access is now invalid.
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-a/test b/sbt/src/sbt-test/source-dependencies/remove-test-a/test
similarity index 72%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-a/test
rename to sbt/src/sbt-test/source-dependencies/remove-test-a/test
index a3ed3425c..ea5cc469c 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/remove-test-a/test
+++ b/sbt/src/sbt-test/source-dependencies/remove-test-a/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 $ copy-file changes/1.scala src/main/scala/1.scala
--> +compile
+-> compile
 
 $ delete src/main/scala/1.scala
-> +compile
\ No newline at end of file
+> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/project/build.properties b/sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/test b/sbt/src/sbt-test/source-dependencies/remove-test-b/test
similarity index 79%
rename from sbt_pending/src/sbt-test/source-dependencies/remove-test-b/test
rename to sbt/src/sbt-test/source-dependencies/remove-test-b/test
index 7115a1b3a..79a6db6c8 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/remove-test-b/test
+++ b/sbt/src/sbt-test/source-dependencies/remove-test-b/test
@@ -1,25 +1,25 @@
-> +compile
+> compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
--> +compile
+-> compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-> +compile
+> compile
 
 $ delete src/main/scala/B.scala
--> +compile
+-> compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-> +compile
+> compile
 
 $ copy-file changes/B4.scala src/main/scala/B.scala
--> +compile
+-> compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-> +compile
+> compile
 
 $ copy-file changes/B5.scala src/main/scala/B.scala
--> +compile
+-> compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-> +compile
\ No newline at end of file
+> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt/src/sbt-test/source-dependencies/repeated-parameters/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/A.scala
rename to sbt/src/sbt-test/source-dependencies/repeated-parameters/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt/src/sbt-test/source-dependencies/repeated-parameters/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/B.scala
rename to sbt/src/sbt-test/source-dependencies/repeated-parameters/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties b/sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/test b/sbt/src/sbt-test/source-dependencies/repeated-parameters/test
similarity index 85%
rename from sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/test
rename to sbt/src/sbt-test/source-dependencies/repeated-parameters/test
index e91d8d6ce..4964ab5a8 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/repeated-parameters/test
+++ b/sbt/src/sbt-test/source-dependencies/repeated-parameters/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # change repeated parameters to Seq
 $ copy-file changes/A.scala A.scala
 
 # B.scala needs recompiling because the type has changed
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala
rename to sbt/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala
rename to sbt/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
new file mode 100644
index 000000000..51bca4efb
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
@@ -0,0 +1,12 @@
+import sbt._
+import java.net.URLClassLoader
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	lazy val checkFirst = checkTask("First")
+	lazy val checkSecond = checkTask("Second")
+	private def checkTask(className: String) =
+		fullClasspath(Configurations.Runtime) map { runClasspath =>
+			val cp = runClasspath.map(_.data.toURI.toURL).toArray
+			Class.forName(className, false, new URLClassLoader(cp))
+		}
+}
diff --git a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/test b/sbt/src/sbt-test/source-dependencies/replace-test-a/test
similarity index 56%
rename from sbt_pending/src/sbt-test/source-dependencies/replace-test-a/test
rename to sbt/src/sbt-test/source-dependencies/replace-test-a/test
index f8e0dd629..4b4ad3a2b 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/test
+++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/test
@@ -1,9 +1,9 @@
 $ copy-file changes/first.scala src/main/scala/A.scala
-> +compile
-> +check-first
--> +check-second
+> compile
+> check-first
+-> check-second
 
 $ copy-file changes/second.scala src/main/scala/A.scala
-> +compile
--> +check-first
-> +check-second
\ No newline at end of file
+> compile
+-> check-first
+> check-second
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/sealed/A.scala b/sbt/src/sbt-test/source-dependencies/sealed/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/sealed/A.scala
rename to sbt/src/sbt-test/source-dependencies/sealed/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/sealed/D.scala b/sbt/src/sbt-test/source-dependencies/sealed/D.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/sealed/D.scala
rename to sbt/src/sbt-test/source-dependencies/sealed/D.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt/src/sbt-test/source-dependencies/sealed/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/sealed/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/sealed/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/sealed/project/build.properties b/sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/sealed/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/sealed/test b/sbt/src/sbt-test/source-dependencies/sealed/test
similarity index 92%
rename from sbt_pending/src/sbt-test/source-dependencies/sealed/test
rename to sbt/src/sbt-test/source-dependencies/sealed/test
index 442841a12..1aecb667e 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/sealed/test
+++ b/sbt/src/sbt-test/source-dependencies/sealed/test
@@ -1,4 +1,4 @@
-> +compile
+> compile
 
 # have new class E extend A
 $ copy-file changes/A.scala A.scala
@@ -6,4 +6,4 @@ $ copy-file changes/A.scala A.scala
 # D.scala needs recompiling because the pattern match in D
 # is no longer exhaustive, which should be a warning
 # there is no way to make warnings errors, so this has to be manually checked
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/A.scala b/sbt/src/sbt-test/source-dependencies/specialized/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/A.scala
rename to sbt/src/sbt-test/source-dependencies/specialized/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/B.scala b/sbt/src/sbt-test/source-dependencies/specialized/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/B.scala
rename to sbt/src/sbt-test/source-dependencies/specialized/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt/src/sbt-test/source-dependencies/specialized/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/specialized/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/project/build.properties b/sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala b/sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
rename to sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/specialized/test b/sbt/src/sbt-test/source-dependencies/specialized/test
similarity index 93%
rename from sbt_pending/src/sbt-test/source-dependencies/specialized/test
rename to sbt/src/sbt-test/source-dependencies/specialized/test
index 8661bc0d7..b9e1ad09c 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/specialized/test
+++ b/sbt/src/sbt-test/source-dependencies/specialized/test
@@ -1,5 +1,4 @@
 # -Yspecialize is 2.8 only
-> ++2.8.0-SNAPSHOT
 > compile
 
 # verify that erased A.x can be called normally and reflectively
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/A.scala b/sbt/src/sbt-test/source-dependencies/stability-change/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/A.scala
rename to sbt/src/sbt-test/source-dependencies/stability-change/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/B.scala b/sbt/src/sbt-test/source-dependencies/stability-change/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/B.scala
rename to sbt/src/sbt-test/source-dependencies/stability-change/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/C.scala b/sbt/src/sbt-test/source-dependencies/stability-change/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/C.scala
rename to sbt/src/sbt-test/source-dependencies/stability-change/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt/src/sbt-test/source-dependencies/stability-change/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/stability-change/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/stability-change/test b/sbt/src/sbt-test/source-dependencies/stability-change/test
similarity index 81%
rename from sbt_pending/src/sbt-test/source-dependencies/stability-change/test
rename to sbt/src/sbt-test/source-dependencies/stability-change/test
index aea970990..887778d24 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/stability-change/test
+++ b/sbt/src/sbt-test/source-dependencies/stability-change/test
@@ -1,6 +1,6 @@
-> +compile
+> compile
 
 # replace val x with var x, invalidating the import in B
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/A.scala b/sbt/src/sbt-test/source-dependencies/struct-usage/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct-usage/A.scala
rename to sbt/src/sbt-test/source-dependencies/struct-usage/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/B.scala b/sbt/src/sbt-test/source-dependencies/struct-usage/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct-usage/B.scala
rename to sbt/src/sbt-test/source-dependencies/struct-usage/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/changes/A.scala b/sbt/src/sbt-test/source-dependencies/struct-usage/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct-usage/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/struct-usage/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/project/build.properties b/sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct-usage/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/test b/sbt/src/sbt-test/source-dependencies/struct-usage/test
similarity index 63%
rename from sbt_pending/src/sbt-test/source-dependencies/struct-usage/test
rename to sbt/src/sbt-test/source-dependencies/struct-usage/test
index b25104c62..751cde01b 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/struct-usage/test
+++ b/sbt/src/sbt-test/source-dependencies/struct-usage/test
@@ -1,5 +1,5 @@
-> +compile
+> compile
 
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/A.scala b/sbt/src/sbt-test/source-dependencies/struct/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/A.scala
rename to sbt/src/sbt-test/source-dependencies/struct/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/B.scala b/sbt/src/sbt-test/source-dependencies/struct/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/B.scala
rename to sbt/src/sbt-test/source-dependencies/struct/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/C.scala b/sbt/src/sbt-test/source-dependencies/struct/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/C.scala
rename to sbt/src/sbt-test/source-dependencies/struct/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/changes/A.scala b/sbt/src/sbt-test/source-dependencies/struct/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/struct/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/project/build.properties b/sbt/src/sbt-test/source-dependencies/struct/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/struct/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/struct/test b/sbt/src/sbt-test/source-dependencies/struct/test
similarity index 84%
rename from sbt_pending/src/sbt-test/source-dependencies/struct/test
rename to sbt/src/sbt-test/source-dependencies/struct/test
index ef218b0d9..8c7328ea4 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/struct/test
+++ b/sbt/src/sbt-test/source-dependencies/struct/test
@@ -1,6 +1,6 @@
->+compile
+> compile
 
 # modify A.scala so that it does not conform to the structural type in B.scala
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/test b/sbt/src/sbt-test/source-dependencies/transitive-a/test
similarity index 70%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/test
rename to sbt/src/sbt-test/source-dependencies/transitive-a/test
index a0889f9d8..774b014aa 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/test
+++ b/sbt/src/sbt-test/source-dependencies/transitive-a/test
@@ -1,4 +1,4 @@
-> +compile
+> compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/project/build.properties b/sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
rename to sbt/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/test b/sbt/src/sbt-test/source-dependencies/transitive-b/test
similarity index 69%
rename from sbt_pending/src/sbt-test/source-dependencies/new-cyclic/test
rename to sbt/src/sbt-test/source-dependencies/transitive-b/test
index aae8fdeaf..774b014aa 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/new-cyclic/test
+++ b/sbt/src/sbt-test/source-dependencies/transitive-b/test
@@ -1,4 +1,4 @@
-> +compile
+> compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
--> +compile
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/A.scala b/sbt/src/sbt-test/source-dependencies/type-parameter/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/A.scala
rename to sbt/src/sbt-test/source-dependencies/type-parameter/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/B.scala b/sbt/src/sbt-test/source-dependencies/type-parameter/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/B.scala
rename to sbt/src/sbt-test/source-dependencies/type-parameter/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/C.scala b/sbt/src/sbt-test/source-dependencies/type-parameter/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/C.scala
rename to sbt/src/sbt-test/source-dependencies/type-parameter/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/D.scala b/sbt/src/sbt-test/source-dependencies/type-parameter/D.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/D.scala
rename to sbt/src/sbt-test/source-dependencies/type-parameter/D.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt/src/sbt-test/source-dependencies/type-parameter/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/type-parameter/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/project/build.properties b/sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/test b/sbt/src/sbt-test/source-dependencies/type-parameter/test
similarity index 87%
rename from sbt_pending/src/sbt-test/source-dependencies/type-parameter/test
rename to sbt/src/sbt-test/source-dependencies/type-parameter/test
index 8bd892f7a..2063e9e1b 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/type-parameter/test
+++ b/sbt/src/sbt-test/source-dependencies/type-parameter/test
@@ -1,7 +1,7 @@
-> +compile
+> compile
 
 # remove type parameter from A
 $ copy-file changes/A.scala A.scala
 
 # should get compile error because B, C, D reference A without a type parameter
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/A.scala b/sbt/src/sbt-test/source-dependencies/typeref-return/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/typeref-return/A.scala
rename to sbt/src/sbt-test/source-dependencies/typeref-return/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/B.scala b/sbt/src/sbt-test/source-dependencies/typeref-return/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/typeref-return/B.scala
rename to sbt/src/sbt-test/source-dependencies/typeref-return/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt/src/sbt-test/source-dependencies/typeref-return/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/typeref-return/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/typeref-return/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/project/build.properties b/sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/typeref-return/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/test b/sbt/src/sbt-test/source-dependencies/typeref-return/test
similarity index 63%
rename from sbt_pending/src/sbt-test/source-dependencies/typeref-return/test
rename to sbt/src/sbt-test/source-dependencies/typeref-return/test
index b25104c62..751cde01b 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/typeref-return/test
+++ b/sbt/src/sbt-test/source-dependencies/typeref-return/test
@@ -1,5 +1,5 @@
-> +compile
+> compile
 
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/var/A.scala b/sbt/src/sbt-test/source-dependencies/var/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/var/A.scala
rename to sbt/src/sbt-test/source-dependencies/var/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/var/B.scala b/sbt/src/sbt-test/source-dependencies/var/B.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/var/B.scala
rename to sbt/src/sbt-test/source-dependencies/var/B.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/var/changes/A.scala b/sbt/src/sbt-test/source-dependencies/var/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/var/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/var/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/var/project/build.properties b/sbt/src/sbt-test/source-dependencies/var/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/var/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/var/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/var/test b/sbt/src/sbt-test/source-dependencies/var/test
similarity index 77%
rename from sbt_pending/src/sbt-test/source-dependencies/var/test
rename to sbt/src/sbt-test/source-dependencies/var/test
index 4debd1fd1..1da88684d 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/var/test
+++ b/sbt/src/sbt-test/source-dependencies/var/test
@@ -1,6 +1,6 @@
-> +compile
+> compile
 
 # replace var x with def x, def x_=
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/variance/A.scala b/sbt/src/sbt-test/source-dependencies/variance/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/variance/A.scala
rename to sbt/src/sbt-test/source-dependencies/variance/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/variance/C.scala b/sbt/src/sbt-test/source-dependencies/variance/C.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/variance/C.scala
rename to sbt/src/sbt-test/source-dependencies/variance/C.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/variance/changes/A.scala b/sbt/src/sbt-test/source-dependencies/variance/changes/A.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/variance/changes/A.scala
rename to sbt/src/sbt-test/source-dependencies/variance/changes/A.scala
diff --git a/sbt_pending/src/sbt-test/source-dependencies/variance/project/build.properties b/sbt/src/sbt-test/source-dependencies/variance/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/source-dependencies/variance/project/build.properties
rename to sbt/src/sbt-test/source-dependencies/variance/project/build.properties
diff --git a/sbt_pending/src/sbt-test/source-dependencies/variance/test b/sbt/src/sbt-test/source-dependencies/variance/test
similarity index 72%
rename from sbt_pending/src/sbt-test/source-dependencies/variance/test
rename to sbt/src/sbt-test/source-dependencies/variance/test
index db6d5af10..d74e441e7 100644
--- a/sbt_pending/src/sbt-test/source-dependencies/variance/test
+++ b/sbt/src/sbt-test/source-dependencies/variance/test
@@ -1,6 +1,6 @@
-> +compile
+> compile
 
 # make T invariant
 $ copy-file changes/A.scala A.scala
 
--> +compile
\ No newline at end of file
+-> compile
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/ivy.xml b/sbt/src/sbt-test/tests/Class.forName/ivy.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/ivy.xml
rename to sbt/src/sbt-test/tests/Class.forName/ivy.xml
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/project/build.properties b/sbt/src/sbt-test/tests/Class.forName/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/project/build.properties
rename to sbt/src/sbt-test/tests/Class.forName/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/project/build/TestProject.scala b/sbt/src/sbt-test/tests/Class.forName/project/build/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/project/build/TestProject.scala
rename to sbt/src/sbt-test/tests/Class.forName/project/build/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/src/main/scala/Test.scala b/sbt/src/sbt-test/tests/Class.forName/src/main/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/src/main/scala/Test.scala
rename to sbt/src/sbt-test/tests/Class.forName/src/main/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/src/test/scala/Test.scala b/sbt/src/sbt-test/tests/Class.forName/src/test/scala/Test.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/src/test/scala/Test.scala
rename to sbt/src/sbt-test/tests/Class.forName/src/test/scala/Test.scala
diff --git a/sbt_pending/src/sbt-test/tests/Class.forName/test b/sbt/src/sbt-test/tests/Class.forName/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/Class.forName/test
rename to sbt/src/sbt-test/tests/Class.forName/test
diff --git a/sbt_pending/src/sbt-test/tests/arguments/project/build.properties b/sbt/src/sbt-test/tests/arguments/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/arguments/project/build.properties
rename to sbt/src/sbt-test/tests/arguments/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala b/sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
rename to sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
diff --git a/sbt_pending/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala b/sbt/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
rename to sbt/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
diff --git a/sbt_pending/src/sbt-test/tests/arguments/test b/sbt/src/sbt-test/tests/arguments/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/arguments/test
rename to sbt/src/sbt-test/tests/arguments/test
diff --git a/sbt_pending/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala
rename to sbt/src/sbt-test/tests/it/changes/ClassFailModuleFail.scala
diff --git a/sbt_pending/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala b/sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala
rename to sbt/src/sbt-test/tests/it/changes/ClassFailModuleSuccess.scala
diff --git a/sbt_pending/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala
rename to sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleFail.scala
diff --git a/sbt_pending/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala b/sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala
rename to sbt/src/sbt-test/tests/it/changes/ClassSuccessModuleSuccess.scala
diff --git a/sbt_pending/src/sbt-test/tests/it/project/build.properties b/sbt/src/sbt-test/tests/it/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/project/build.properties
rename to sbt/src/sbt-test/tests/it/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/it/project/build/TestProject.scala b/sbt/src/sbt-test/tests/it/project/build/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/project/build/TestProject.scala
rename to sbt/src/sbt-test/tests/it/project/build/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/tests/it/test b/sbt/src/sbt-test/tests/it/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/it/test
rename to sbt/src/sbt-test/tests/it/test
diff --git a/sbt_pending/src/sbt-test/tests/resources/ivy.xml b/sbt/src/sbt-test/tests/resources/ivy.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/ivy.xml
rename to sbt/src/sbt-test/tests/resources/ivy.xml
diff --git a/sbt_pending/src/sbt-test/tests/resources/project/build.properties b/sbt/src/sbt-test/tests/resources/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/project/build.properties
rename to sbt/src/sbt-test/tests/resources/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/resources/src/main/resources/MainResource.txt b/sbt/src/sbt-test/tests/resources/src/main/resources/MainResource.txt
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/src/main/resources/MainResource.txt
rename to sbt/src/sbt-test/tests/resources/src/main/resources/MainResource.txt
diff --git a/sbt_pending/src/sbt-test/tests/resources/src/test/resources/TestResource.txt b/sbt/src/sbt-test/tests/resources/src/test/resources/TestResource.txt
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/src/test/resources/TestResource.txt
rename to sbt/src/sbt-test/tests/resources/src/test/resources/TestResource.txt
diff --git a/sbt_pending/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala b/sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
rename to sbt/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
diff --git a/sbt_pending/src/sbt-test/tests/resources/test b/sbt/src/sbt-test/tests/resources/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/resources/test
rename to sbt/src/sbt-test/tests/resources/test
diff --git a/sbt_pending/src/sbt-test/tests/scalacheck-compat/project/build.properties b/sbt/src/sbt-test/tests/scalacheck-compat/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalacheck-compat/project/build.properties
rename to sbt/src/sbt-test/tests/scalacheck-compat/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala b/sbt/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
rename to sbt/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala b/sbt/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
rename to sbt/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala b/sbt/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
rename to sbt/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalacheck-compat/test b/sbt/src/sbt-test/tests/scalacheck-compat/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalacheck-compat/test
rename to sbt/src/sbt-test/tests/scalacheck-compat/test
diff --git a/sbt_pending/src/sbt-test/tests/scalatest-compat/project/build.properties b/sbt/src/sbt-test/tests/scalatest-compat/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalatest-compat/project/build.properties
rename to sbt/src/sbt-test/tests/scalatest-compat/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala b/sbt/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
rename to sbt/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala b/sbt/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
rename to sbt/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala b/sbt/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
rename to sbt/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
diff --git a/sbt_pending/src/sbt-test/tests/scalatest-compat/test b/sbt/src/sbt-test/tests/scalatest-compat/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/scalatest-compat/test
rename to sbt/src/sbt-test/tests/scalatest-compat/test
diff --git a/sbt_pending/src/sbt-test/tests/specs-compat/project/build.properties b/sbt/src/sbt-test/tests/specs-compat/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-compat/project/build.properties
rename to sbt/src/sbt-test/tests/specs-compat/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala b/sbt/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
rename to sbt/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala b/sbt/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
rename to sbt/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala b/sbt/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
rename to sbt/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-compat/test b/sbt/src/sbt-test/tests/specs-compat/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-compat/test
rename to sbt/src/sbt-test/tests/specs-compat/test
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
rename to sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
rename to sbt/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
rename to sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala b/sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
rename to sbt/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/project/build.properties b/sbt/src/sbt-test/tests/specs-run/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/project/build.properties
rename to sbt/src/sbt-test/tests/specs-run/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/project/build/TestProject.scala b/sbt/src/sbt-test/tests/specs-run/project/build/TestProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/project/build/TestProject.scala
rename to sbt/src/sbt-test/tests/specs-run/project/build/TestProject.scala
diff --git a/sbt_pending/src/sbt-test/tests/specs-run/test b/sbt/src/sbt-test/tests/specs-run/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/specs-run/test
rename to sbt/src/sbt-test/tests/specs-run/test
diff --git a/sbt_pending/src/sbt-test/tests/test-failed/changes/Fail.scala b/sbt/src/sbt-test/tests/test-failed/changes/Fail.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/test-failed/changes/Fail.scala
rename to sbt/src/sbt-test/tests/test-failed/changes/Fail.scala
diff --git a/sbt_pending/src/sbt-test/tests/test-failed/changes/Success.scala b/sbt/src/sbt-test/tests/test-failed/changes/Success.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/test-failed/changes/Success.scala
rename to sbt/src/sbt-test/tests/test-failed/changes/Success.scala
diff --git a/sbt_pending/src/sbt-test/tests/test-failed/project/build.properties b/sbt/src/sbt-test/tests/test-failed/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/test-failed/project/build.properties
rename to sbt/src/sbt-test/tests/test-failed/project/build.properties
diff --git a/sbt_pending/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/sbt/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
rename to sbt/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
diff --git a/sbt_pending/src/sbt-test/tests/test-failed/test b/sbt/src/sbt-test/tests/test-failed/test
similarity index 100%
rename from sbt_pending/src/sbt-test/tests/test-failed/test
rename to sbt/src/sbt-test/tests/test-failed/test
diff --git a/sbt_pending/src/sbt-test/web/jsp/changes/index.jsp b/sbt/src/sbt-test/web/jsp/changes/index.jsp
similarity index 100%
rename from sbt_pending/src/sbt-test/web/jsp/changes/index.jsp
rename to sbt/src/sbt-test/web/jsp/changes/index.jsp
diff --git a/sbt_pending/src/sbt-test/web/jsp/project/build.properties b/sbt/src/sbt-test/web/jsp/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/web/jsp/project/build.properties
rename to sbt/src/sbt-test/web/jsp/project/build.properties
diff --git a/sbt_pending/src/sbt-test/web/jsp/project/build/JSP.scala b/sbt/src/sbt-test/web/jsp/project/build/JSP.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/jsp/project/build/JSP.scala
rename to sbt/src/sbt-test/web/jsp/project/build/JSP.scala
diff --git a/sbt_pending/src/sbt-test/web/jsp/src/main/webapp/index.jsp b/sbt/src/sbt-test/web/jsp/src/main/webapp/index.jsp
similarity index 100%
rename from sbt_pending/src/sbt-test/web/jsp/src/main/webapp/index.jsp
rename to sbt/src/sbt-test/web/jsp/src/main/webapp/index.jsp
diff --git a/sbt_pending/src/sbt-test/web/jsp/test b/sbt/src/sbt-test/web/jsp/test
similarity index 100%
rename from sbt_pending/src/sbt-test/web/jsp/test
rename to sbt/src/sbt-test/web/jsp/test
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/changes/MyServlet1.scala b/sbt/src/sbt-test/web/servlet-direct/changes/MyServlet1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/changes/MyServlet1.scala
rename to sbt/src/sbt-test/web/servlet-direct/changes/MyServlet1.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/changes/MyServlet2.scala b/sbt/src/sbt-test/web/servlet-direct/changes/MyServlet2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/changes/MyServlet2.scala
rename to sbt/src/sbt-test/web/servlet-direct/changes/MyServlet2.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/project/build.properties b/sbt/src/sbt-test/web/servlet-direct/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/project/build.properties
rename to sbt/src/sbt-test/web/servlet-direct/project/build.properties
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
rename to sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml b/sbt/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
rename to sbt/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
diff --git a/sbt_pending/src/sbt-test/web/servlet-direct/test b/sbt/src/sbt-test/web/servlet-direct/test
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-direct/test
rename to sbt/src/sbt-test/web/servlet-direct/test
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala b/sbt/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
rename to sbt/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala b/sbt/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
rename to sbt/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/project/build.properties b/sbt/src/sbt-test/web/servlet-nodup/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/project/build.properties
rename to sbt/src/sbt-test/web/servlet-nodup/project/build.properties
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
rename to sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml b/sbt/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
rename to sbt/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
diff --git a/sbt_pending/src/sbt-test/web/servlet-nodup/test b/sbt/src/sbt-test/web/servlet-nodup/test
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet-nodup/test
rename to sbt/src/sbt-test/web/servlet-nodup/test
diff --git a/sbt_pending/src/sbt-test/web/servlet/changes/MyServlet1.scala b/sbt/src/sbt-test/web/servlet/changes/MyServlet1.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/changes/MyServlet1.scala
rename to sbt/src/sbt-test/web/servlet/changes/MyServlet1.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet/changes/MyServlet2.scala b/sbt/src/sbt-test/web/servlet/changes/MyServlet2.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/changes/MyServlet2.scala
rename to sbt/src/sbt-test/web/servlet/changes/MyServlet2.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet/project/build.properties b/sbt/src/sbt-test/web/servlet/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/project/build.properties
rename to sbt/src/sbt-test/web/servlet/project/build.properties
diff --git a/sbt_pending/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
rename to sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
diff --git a/sbt_pending/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml b/sbt/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
rename to sbt/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sbt_pending/src/sbt-test/web/servlet/test b/sbt/src/sbt-test/web/servlet/test
similarity index 100%
rename from sbt_pending/src/sbt-test/web/servlet/test
rename to sbt/src/sbt-test/web/servlet/test
diff --git a/sbt_pending/src/sbt-test/web/unmanaged/project/build.properties b/sbt/src/sbt-test/web/unmanaged/project/build.properties
similarity index 100%
rename from sbt_pending/src/sbt-test/web/unmanaged/project/build.properties
rename to sbt/src/sbt-test/web/unmanaged/project/build.properties
diff --git a/sbt_pending/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala b/sbt/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
similarity index 100%
rename from sbt_pending/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
rename to sbt/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
diff --git a/sbt_pending/src/sbt-test/web/unmanaged/test b/sbt/src/sbt-test/web/unmanaged/test
similarity index 100%
rename from sbt_pending/src/sbt-test/web/unmanaged/test
rename to sbt/src/sbt-test/web/unmanaged/test
diff --git a/sbt_pending/scripted/LICENSE b/sbt_pending/scripted/LICENSE
deleted file mode 100644
index 27b5d6df2..000000000
--- a/sbt_pending/scripted/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2008, 2009, 2010 Mark Harrah
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/sbt_pending/scripted/project/build.properties b/sbt_pending/scripted/project/build.properties
deleted file mode 100644
index 806b56628..000000000
--- a/sbt_pending/scripted/project/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-project.name=scripted
-project.organization=org.scala-tools.sbt
-project.version=0.7.4
-sbt.version=0.7.4
-def.scala.version=2.7.7
-build.scala.versions=2.7.7
-project.initialize=false
diff --git a/sbt_pending/scripted/project/build/SbtTest.scala b/sbt_pending/scripted/project/build/SbtTest.scala
deleted file mode 100644
index 74261ab74..000000000
--- a/sbt_pending/scripted/project/build/SbtTest.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-
-import sbt._
-
-class SbtTest(info: ProjectInfo) extends PluginProject(info)
-{
-	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
-	val interface = "org.scala-tools.sbt" % "launcher-interface" % version.toString % "provided"
-
-	override def mainResources = super.mainResources +++ "LICENSE" +++ "NOTICE"
-
-	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("technically", new java.io.File("/var/dbwww/repo/"))
-	val databinder = Resolver.url("databinder", new java.net.URL("http://databinder.net/repo/"))
-}
\ No newline at end of file
diff --git a/sbt_pending/scripted/src/main/scala/ScriptedTests.scala b/sbt_pending/scripted/src/main/scala/ScriptedTests.scala
deleted file mode 100644
index f42ea49a0..000000000
--- a/sbt_pending/scripted/src/main/scala/ScriptedTests.scala
+++ /dev/null
@@ -1,107 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-
-package sbt.test
-
-import java.io.File
-import java.nio.charset.Charset
-
-import xsbt.IPC
-import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser}
-
-final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull
-{
-	@deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) =
-		this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
-
-	private val testResources = new Resources(resourceBaseDirectory)
-	
-	val ScriptFilename = "test"
-	
-	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
-		testResources.readWriteResourceDirectory(group, name, log) { testDirectory =>
-			scriptedTest(group + " / " + name, testDirectory, log).toLeft(())
-		}.left.toOption
-	private def scriptedTest(label: String, testDirectory: File, log: Logger): Option[String] =
-		IPC.pullServer( scriptedTest0(label, testDirectory, log) )
-	private def scriptedTest0(label: String, testDirectory: File, log: Logger)(server: IPC.Server): Option[String] =
-	{
-		FillProperties(testDirectory, sbtVersion, defScalaVersion, buildScalaVersions)
-		val buffered = new BufferedLogger(log)
-		if(bufferLog)
-			buffered.recordAll
-		
-		def createParser() =
-		{
-			val fileHandler = new FileCommands(testDirectory)
-			val sbtHandler = new SbtHandler(testDirectory, buffered, server)
-			new TestScriptParser(Map('$' -> fileHandler, '>' -> sbtHandler, '#' -> CommentHandler))
-		}
-		def runTest() =
-		{
-			val run = new ScriptRunner
-			val parser = createParser()
-			run(parser.parse(new File(testDirectory, ScriptFilename)))
-		}
-
-		try
-		{
-			runTest()
-			buffered.info("+ " + label)
-			None
-		}
-		catch
-		{
-			case e: xsbt.test.TestException =>
-				buffered.playAll()
-				buffered.error("x " + label)
-				if(e.getCause eq null)
-					buffered.error("   " + e.getMessage)
-				else
-					e.printStackTrace
-				Some(e.toString)
-			case e: Exception =>
-				buffered.playAll()
-				buffered.error("x " + label)
-				throw e
-		}
-		finally { buffered.clearAll() }
-	}
-}
-
-object CompatibilityLevel extends Enumeration
-{
-	val Full, Basic, Minimal, Minimal27, Minimal28 = Value
-
-	def defaultVersions(level: Value) =
-		level match
-		{
-			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1 2.8.0.RC1 2.8.0.RC2 2.8.0-SNAPSHOT"
-			case Basic =>  "2.7.7 2.7.2 2.8.0.RC2"
-			case Minimal => "2.7.7 2.8.0.RC2"
-			case Minimal27 => "2.7.7"
-			case Minimal28 => "2.8.0.RC2"
-		}
-}
-object FillProperties
-{
-	def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit =
-		apply(projectDirectory, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
-	def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit =
-	{
-		import xsbt.Paths._
-		fill(projectDirectory / "project" / "build.properties", sbtVersion, defScalaVersion, buildScalaVersions)
-	}
-	def fill(properties: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String)
-	{
-		val toAppend = extraProperties(sbtVersion, defScalaVersion, buildScalaVersions)
-		xsbt.OpenResource.fileWriter(Charset.forName("ISO-8859-1"), true)(properties) { _.write(toAppend) }
-	}
-	def extraProperties(sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) = 
-<x>
-sbt.version={sbtVersion}
-def.scala.version={defScalaVersion}
-build.scala.versions={buildScalaVersions}
-</x>.text
-}
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala b/sbt_pending/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
deleted file mode 100644
index 7403dfd1d..000000000
--- a/sbt_pending/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class CompactifyTest(info: ProjectInfo) extends DefaultProject(info)
-{
-	def classes = (outputPath ** "*.class").get
-	lazy val outputEmpty = task { if(classes.isEmpty) None else Some("Classes existed:\n\t" + classes.mkString("\n\t")) }
-}
\ No newline at end of file
diff --git a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/project/build/src/TestProject.scala b/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/project/build/src/TestProject.scala
deleted file mode 100644
index ba96abc88..000000000
--- a/sbt_pending/src/sbt-test/source-dependencies/replace-test-a/project/build/src/TestProject.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import sbt._
-import java.net.URLClassLoader
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	lazy val checkFirst = checkTask("First")
-	lazy val checkSecond = checkTask("Second")
-	private def checkTask(className: String) = task { doCheck(className); None }
-	private def doCheck(className: String) = Class.forName(className, false, new URLClassLoader(runClasspath.getURLs))
-}
diff --git a/scripted/CommentHandler.scala b/scripted/base/CommentHandler.scala
similarity index 73%
rename from scripted/CommentHandler.scala
rename to scripted/base/CommentHandler.scala
index 5841b1fb8..2ca6a755d 100644
--- a/scripted/CommentHandler.scala
+++ b/scripted/base/CommentHandler.scala
@@ -3,9 +3,6 @@
  */
 package xsbt.test
 
-import java.io.File
-import xsbt.{FileMapper, FileUtilities, Paths}
-
 object CommentHandler extends BasicStatementHandler
 {
 	def apply(command: String, args: List[String]) = ()
diff --git a/scripted/FileCommands.scala b/scripted/base/FileCommands.scala
similarity index 78%
rename from scripted/FileCommands.scala
rename to scripted/base/FileCommands.scala
index 3003e790e..00f5b4796 100644
--- a/scripted/FileCommands.scala
+++ b/scripted/base/FileCommands.scala
@@ -3,8 +3,9 @@
  */
 package xsbt.test
 
-import java.io.File
-import xsbt.{FileMapper, FileUtilities, Paths}
+	import java.io.File
+	import sbt.{IO, Path}
+	import Path._
 
 class FileCommands(baseDirectory: File) extends BasicStatementHandler
 {
@@ -21,9 +22,9 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler
 			"pause" noArg { readLine("Press enter to continue. "); println() },
 			"sleep" oneArg("Time in milliseconds",  time => Thread.sleep(time.toLong) ),
 			"exec" nonEmpty(execute _ ),
-			"copy" copy (to => FileMapper.rebase(baseDirectory, to)),
+			"copy" copy (to => rebase(baseDirectory, to)),
 			"copy-file" twoArg("Two paths", copyFile _),
-			"copy-flat" copy (FileMapper.flat)
+			"copy-flat" copy flat
 		)
 
 	def apply(command: String, arguments: List[String]): Unit =
@@ -32,19 +33,16 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler
 	def scriptError(message: String): Some[String] = error("Test script error: " + message)
 	def spaced[T](l: Seq[T]) = l.mkString(" ")
 	def fromStrings(paths: List[String]) = paths.map(fromString)
-	def fromString(path: String) =
-	{
-		import Paths._
-		baseDirectory / path
-	}
-	def touch(paths: List[String]) = FileUtilities.touch(fromStrings(paths))
-	def delete(paths: List[String]): Unit = FileUtilities.delete(fromStrings(paths))
+	def fromString(path: String) = Path.fromString(baseDirectory, path)
+	def touch(paths: List[String]) = IO.touch(fromStrings(paths))
+	def delete(paths: List[String]): Unit = IO.delete(fromStrings(paths))
 	/*def sync(from: String, to: String) =
-		FileUtilities.sync(fromString(from), fromString(to), log)*/
+		IO.sync(fromString(from), fromString(to), log)*/
 	def copyFile(from: String, to: String): Unit =
-		FileUtilities.copyFile(fromString(from), fromString(to))
+		IO.copyFile(fromString(from), fromString(to))
 	def makeDirectories(paths: List[String]) =
-		 FileUtilities.createDirectories(fromStrings(paths))
+		IO.createDirectories(fromStrings(paths))
+
 	def newer(a: String, b: String) =
 	{
 		val pathA = fromString(a)
@@ -70,8 +68,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler
 			scriptError("Command was empty.")
 		else
 		{
-			val builder = new java.lang.ProcessBuilder((command :: args).toArray :  _*).directory(baseDirectory)
-			val exitValue = ( Process(builder) ! )
+			val exitValue = sbt.Process(command :: args, baseDirectory) ! ;
 			if(exitValue != 0)
 				error("Nonzero exit value (" + exitValue + ")")
 		}
@@ -91,7 +88,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler
 			}
 		def twoArg(requiredArgs: String, action: (String, String) => Unit): NamedCommand =
 			commandName -> {
-				case List(from, to) => copyFile(from, to)
+				case List(from, to) => action(from, to)
 				case other => wrongArguments(requiredArgs, other)
 			}
 		def noArg(action: => Unit): NamedCommand =
@@ -104,16 +101,14 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler
 				case List(single) => action(single)
 				case other => wrongArguments(requiredArgs, other)
 			}
-		def copy(mapper: File => FileMapper): NamedCommand =
+		def copy(mapper: File => FileMap): NamedCommand =
 			commandName -> {
 				case Nil => scriptError("No paths specified for " + commandName + " command.")
 				case path :: Nil => scriptError("No destination specified for " + commandName + " command.")
 				case paths =>
-					val mapped = fromStrings(paths).toArray
-					val last = mapped.length - 1
-					val map = mapper(mapped(last))
-					import Paths._
-					FileUtilities.copy( mapped.take(last) x map )
+					val mapped = fromStrings(paths)
+					val map = mapper(mapped.last)
+					IO.copy( mapped.init x map )
 			}
 		def wrongArguments(args: List[String]): Some[String] =
 			scriptError("Command '" + commandName + "' does not accept arguments (found '" + spaced(args) + "').")
diff --git a/scripted/FilteredLoader.scala b/scripted/base/FilteredLoader.scala
similarity index 95%
rename from scripted/FilteredLoader.scala
rename to scripted/base/FilteredLoader.scala
index 983edf040..13800cb12 100644
--- a/scripted/FilteredLoader.scala
+++ b/scripted/base/FilteredLoader.scala
@@ -3,7 +3,7 @@
  */
 package xsbt.test
 
-final class FilteredLoader(parent: ClassLoader) extends ClassLoader(parent) with NotNull
+final class FilteredLoader(parent: ClassLoader) extends ClassLoader(parent)
 {
 	@throws(classOf[ClassNotFoundException])
 	override final def loadClass(className: String, resolve: Boolean): Class[_] =
diff --git a/scripted/NOTICE b/scripted/base/NOTICE
similarity index 100%
rename from scripted/NOTICE
rename to scripted/base/NOTICE
diff --git a/scripted/ScriptRunner.scala b/scripted/base/ScriptRunner.scala
similarity index 100%
rename from scripted/ScriptRunner.scala
rename to scripted/base/ScriptRunner.scala
diff --git a/scripted/StatementHandler.scala b/scripted/base/StatementHandler.scala
similarity index 100%
rename from scripted/StatementHandler.scala
rename to scripted/base/StatementHandler.scala
diff --git a/scripted/TestScriptParser.scala b/scripted/base/TestScriptParser.scala
similarity index 98%
rename from scripted/TestScriptParser.scala
rename to scripted/base/TestScriptParser.scala
index 26f2bb4eb..5c6049ebb 100644
--- a/scripted/TestScriptParser.scala
+++ b/scripted/base/TestScriptParser.scala
@@ -7,7 +7,7 @@ import java.io.{BufferedReader, File, InputStreamReader}
 import scala.util.parsing.combinator._
 import scala.util.parsing.input.Positional
 import Character.isWhitespace
-import xsbt.FileUtilities
+import sbt.IO
 
 /*
 statement*
@@ -36,7 +36,7 @@ class TestScriptParser(handlers: Map[Char, StatementHandler]) extends RegexParse
 	require(!handlers.isEmpty)
 	override def skipWhitespace = false
 
-	import FileUtilities.read
+	import IO.read
 	if(handlers.keys.exists(isWhitespace))
 		error("Start characters cannot be whitespace")
 	if(handlers.keys.exists(key => key == '+' || key == '-'))
diff --git a/sbt_pending/scripted/src/main/scala/Scripted.scala b/scripted/plugin/Scripted.scala
similarity index 63%
rename from sbt_pending/scripted/src/main/scala/Scripted.scala
rename to scripted/plugin/Scripted.scala
index e08299b9f..a59bf1976 100644
--- a/sbt_pending/scripted/src/main/scala/Scripted.scala
+++ b/scripted/plugin/Scripted.scala
@@ -7,6 +7,7 @@ import Scripted._
 import FileUtilities.wrapNull
 import java.io.File
 import java.net.URLClassLoader
+import xsbt.ScalaInstance
 
 trait ScalaScripted extends BasicScalaProject with Scripted with MavenStyleScalaPaths
 {
@@ -26,14 +27,18 @@ final case class ScriptedTest(group: String, name: String) extends NotNull
 {
 	override def toString = group + "/" + name
 }
-trait Scripted extends Project with MultiTaskProject
+trait Scripted extends BasicManagedProject with MultiTaskProject
 {
 	def scriptedCompatibility = CompatibilityLevel.Minimal
 	def scriptedBuildVersions = CompatibilityLevel.defaultVersions(scriptedCompatibility)
 	def scriptedDefScala = buildScalaVersion
 	def scriptedSbt = projectVersion.value.toString
 	def scriptedBufferLog = true
-	
+
+	lazy val scriptedConf = config("sbt-scripted")
+	lazy val scriptedSbtDep = "org.scala-tools.sbt" % ("scripted-sbt_" + buildScalaVersion) % version.toString % scriptedConf.toString
+	def scriptedClasspath = configurationClasspath(scriptedConf)
+
 	def sbtTests: Path
 	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests)) dependsOn(dependencies : _*)
 	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { (args, includeFunction) =>
@@ -43,11 +48,11 @@ trait Scripted extends Project with MultiTaskProject
 	def listTests = (new ListTests(sbtTests.asFile, include _, log)).listTests
 	def scriptedTests(tests: Seq[ScriptedTest], dependencies: ManagedTask*) =
 	{
-		val runner = new ScriptedTests(sbtTests.asFile, scriptedBufferLog, scriptedSbt, scriptedDefScala, scriptedBuildVersions)
+		val runner = Scripted.makeScripted(buildScalaInstance, scriptedClasspath)(sbtTests.asFile, scriptedBufferLog, scriptedSbt, scriptedDefScala, scriptedBuildVersions)
 		
 		val startTask = task { None } named("scripted-test-start") dependsOn(dependencies  : _*)
 		def scriptedTest(test: ScriptedTest) =
-			task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
+			task { Scripted.runScripted(runner, test.group, test.name, log) } named test.toString dependsOn(startTask)
 		val testTasks = tests.map(scriptedTest)
 		task {None} named("scripted-test-complete") dependsOn(testTasks : _*)
 	}
@@ -60,6 +65,19 @@ private[test] object Scripted
 {
 	val SbtTestDirectoryName = "sbt-test"
 	def list(directory: File, filter: java.io.FileFilter) = wrapNull(directory.listFiles(filter))
+
+	def makeScripted(scalaI: ScalaInstance, cp: PathFinder)(directory: File, buffer: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): AnyRef =
+	{
+		val loader = ClasspathUtilities.toLoader(cp, scalaI.loader)
+		val c = Class.forName("sbt.test.ScriptedTests", true, loader)
+		val con = c.getConstructor(classOf[File], classOf[Boolean], classOf[String], classOf[String], classOf[String])
+		con.newInstance(directory, buffer: java.lang.Boolean, sbtVersion, defScalaVersion, buildScalaVersions).asInstanceOf[AnyRef]
+	}
+	def runScripted(runner: AnyRef, group: String, name: String, log: xsbti.Logger): Option[String] =
+	{
+		try { runner.getClass.getMethod("scriptedTest", classOf[String], classOf[String], classOf[xsbti.Logger]).invoke(runner, group, name, log); None }
+		catch { case x if x.getClass.getName == "xsbt.test.TestException" => Some(x.toString) }
+	}
 }
 private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: Logger) extends NotNull
 {
@@ -93,4 +111,19 @@ private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest =>
 			Set( included.map(_.getName) : _*)
 		}
 	}
+}
+
+object CompatibilityLevel extends Enumeration
+{
+	val Full, Basic, Minimal, Minimal27, Minimal28 = Value
+
+	def defaultVersions(level: Value) =
+		level match
+		{
+			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1 2.8.0.RC1 2.8.0.RC2 2.8.0-SNAPSHOT"
+			case Basic =>  "2.7.7 2.7.2 2.8.0.RC2"
+			case Minimal => "2.7.7 2.8.0.RC2"
+			case Minimal27 => "2.7.7"
+			case Minimal28 => "2.8.0.RC2"
+		}
 }
\ No newline at end of file
diff --git a/sbt_pending/scripted/NOTICE b/scripted/sbt/NOTICE
similarity index 100%
rename from sbt_pending/scripted/NOTICE
rename to scripted/sbt/NOTICE
diff --git a/sbt_pending/scripted/src/main/scala/SbtHandler.scala b/scripted/sbt/SbtHandler.scala
similarity index 68%
rename from sbt_pending/scripted/src/main/scala/SbtHandler.scala
rename to scripted/sbt/SbtHandler.scala
index acd98c122..9de2a1cf4 100644
--- a/sbt_pending/scripted/src/main/scala/SbtHandler.scala
+++ b/scripted/sbt/SbtHandler.scala
@@ -1,14 +1,18 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-package sbt.test
+package sbt
+package test
 
-import java.io.{File, IOException}
-import xsbt.IPC
-import xsbt.test.{StatementHandler, TestFailed}
+	import java.io.{File, IOException}
+	import xsbt.IPC
+	import xsbt.test.{StatementHandler, TestFailed}
 
-final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends StatementHandler
+	import Logger._
+
+final class SbtHandler(directory: File, launcher: File, log: Logger, server: IPC.Server) extends StatementHandler
 {
+	def this(directory: File, launcher: File, log: xsbti.Logger, server: IPC.Server) = this(directory, launcher, log: Logger, server)
 	type State = Process
 	def initialState = newRemote
 	def apply(command: String, arguments: List[String], p: Process): Process =
@@ -32,11 +36,10 @@ final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends
 		}
 	def newRemote =
 	{
-		val launcherJar = FileUtilities.classLocationFile(Class.forName("xsbti.AppProvider")).getAbsolutePath
-		val args = "java" :: "-jar" :: launcherJar :: ( "<" + server.port) :: Nil
-		val builder = new java.lang.ProcessBuilder(args.toArray : _*).directory(directory)
+		val launcherJar = launcher.getAbsolutePath
+		val args = "java" :: "-jar" :: launcherJar :: "loadp" :: ( "<" + server.port) :: Nil
 		val io = BasicIO(log, false).withInput(_.close())
-		val p = Process(builder) run( io )
+		val p = Process(args, directory) run( io )
 		Spawn { p.exitValue(); server.close() }
 		try { receive("Remote sbt initialization failed") }
 		catch { case e: java.net.SocketException => error("Remote sbt initialization failed") }
diff --git a/scripted/sbt/ScriptedTests.scala b/scripted/sbt/ScriptedTests.scala
new file mode 100644
index 000000000..e664ee798
--- /dev/null
+++ b/scripted/sbt/ScriptedTests.scala
@@ -0,0 +1,181 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+package sbt
+package test
+
+import java.io.File
+import java.nio.charset.Charset
+
+import xsbt.IPC
+import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser}
+import IO.wrapNull
+
+final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String, launcher: File)
+{
+	private val testResources = new Resources(resourceBaseDirectory)
+	
+	val ScriptFilename = "test"
+	
+	def scriptedTest(group: String, name: String, log: xsbti.Logger): Unit =
+		scriptedTest(group, name, Logger.xlog2Log(log))
+	def scriptedTest(group: String, name: String, log: Logger): Unit =
+		testResources.readWriteResourceDirectory(group, name) { testDirectory =>
+			scriptedTest(group + " / " + name, testDirectory, log)
+		}
+	private def scriptedTest(label: String, testDirectory: File, log: Logger): Unit =
+		IPC.pullServer( scriptedTest0(label, testDirectory, log) )
+	private def scriptedTest0(label: String, testDirectory: File, log: Logger)(server: IPC.Server)
+	{
+		FillProperties(testDirectory, sbtVersion, defScalaVersion, buildScalaVersions)
+		val buffered = new BufferedLogger(new FullLogger(log))
+		if(bufferLog)
+			buffered.record()
+		
+		def createParser() =
+		{
+			val fileHandler = new FileCommands(testDirectory)
+			val sbtHandler = new SbtHandler(testDirectory, launcher, buffered, server)
+			new TestScriptParser(Map('$' -> fileHandler, '>' -> sbtHandler, '#' -> CommentHandler))
+		}
+		def runTest() =
+		{
+			val run = new ScriptRunner
+			val parser = createParser()
+			run(parser.parse(new File(testDirectory, ScriptFilename)))
+		}
+
+		try
+		{
+			runTest()
+			buffered.info("+ " + label)
+		}
+		catch
+		{
+			case e: xsbt.test.TestException =>
+				buffered.play()
+				buffered.error("x " + label)
+				if(e.getCause eq null)
+					buffered.error("   " + e.getMessage)
+				else
+					e.printStackTrace
+				throw e
+			case e: Exception =>
+				buffered.play()
+				buffered.error("x " + label)
+				throw e
+		}
+		finally { buffered.clear() }
+	}
+}
+object ScriptedTests
+{
+	def main(args: Array[String])
+	{
+		val directory = new File(args(0))
+		val buffer = args(1).toBoolean
+		val sbtVersion = args(2)
+		val defScalaVersion = args(3)
+		val buildScalaVersions = args(4)
+		val bootProperties = new File(args(5))
+		val tests = args.drop(6)
+		val logger = ConsoleLogger()
+		run(directory, buffer, sbtVersion, defScalaVersion, buildScalaVersions, tests, logger, bootProperties)
+	}
+	def run(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String, tests: Array[String], bootProperties: File): Unit =
+		run(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, buildScalaVersions, tests, ConsoleLogger(), bootProperties)//new FullLogger(Logger.xlog2Log(log)))
+
+	def run(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String, tests: Array[String], logger: AbstractLogger, bootProperties: File)
+	{
+		val runner = new ScriptedTests(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, buildScalaVersions, bootProperties)	
+		for( ScriptedTest(group, name) <- get(tests, resourceBaseDirectory, logger) )
+			runner.scriptedTest(group, name, logger)
+	}
+	def get(tests: Seq[String], baseDirectory: File, log: Logger): Seq[ScriptedTest] =
+		if(tests.isEmpty) listTests(baseDirectory, log) else parseTests(tests)
+	def listTests(baseDirectory: File, log: Logger): Seq[ScriptedTest] =
+		(new ListTests(baseDirectory, _ => true, log)).listTests
+	def parseTests(in: Seq[String]): Seq[ScriptedTest] =
+		for(testString <- in) yield
+		{
+			val Array(group,name) = testString.split("/").map(_.trim)
+			ScriptedTest(group,name)
+		}
+}
+object FillProperties
+{
+	def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit =
+	{
+		import sbt.Path._
+		fill(projectDirectory / "project" / "build.properties", sbtVersion, defScalaVersion, buildScalaVersions)
+	}
+	def fill(properties: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String)
+	{
+		val toAppend = extraProperties(sbtVersion, defScalaVersion, buildScalaVersions)
+		IO.write(properties, toAppend, Charset.forName("ISO-8859-1"), true)
+	}
+	def extraProperties(sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) = 
+<x>
+sbt.version={sbtVersion}
+def.scala.version={defScalaVersion}
+build.scala.versions={buildScalaVersions}
+</x>.text
+}
+final case class ScriptedTest(group: String, name: String) extends NotNull
+{
+	override def toString = group + "/" + name
+}
+private[test] object ListTests
+{
+	def list(directory: File, filter: java.io.FileFilter) = wrapNull(directory.listFiles(filter))
+}
+	import ListTests._
+private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: Logger) extends NotNull
+{
+	def filter = DirectoryFilter -- HiddenFileFilter
+	def listTests: Seq[ScriptedTest] =
+	{
+		list(baseDirectory, filter) flatMap { group =>
+			val groupName = group.getName
+			listTests(group).map(ScriptedTest(groupName, _))
+		}
+	}
+	private[this] def listTests(group: File): Set[String] =
+	{
+		val groupName = group.getName
+		val allTests = list(group, filter)
+		if(allTests.isEmpty)
+		{
+			log.warn("No tests in test group " + groupName)
+			Set.empty
+		}
+		else
+		{
+			val (included, skipped) = allTests.toList.partition(test => accept(ScriptedTest(groupName, test.getName)))
+			if(included.isEmpty)
+				log.warn("Test group " + groupName + " skipped.")
+			else if(!skipped.isEmpty)
+			{
+				log.warn("Tests skipped in group " + group.getName + ":")
+				skipped.foreach(testName => log.warn(" " + testName.getName))
+			}
+			Set( included.map(_.getName) : _*)
+		}
+	}
+}
+
+object CompatibilityLevel extends Enumeration
+{
+	val Full, Basic, Minimal, Minimal27, Minimal28 = Value
+
+	def defaultVersions(level: Value) =
+		level match
+		{
+			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1 2.8.0.RC1 2.8.0.RC2 2.8.0-SNAPSHOT"
+			case Basic =>  "2.7.7 2.7.2 2.8.0.RC2"
+			case Minimal => "2.7.7 2.8.0.RC2"
+			case Minimal27 => "2.7.7"
+			case Minimal28 => "2.8.0.RC2"
+		}
+}
\ No newline at end of file