diff --git a/project/GenFactories.scala b/project/GenFactories.scala
index 7d6bebc3e1..6abdbd92fd 100644
--- a/project/GenFactories.scala
+++ b/project/GenFactories.scala
@@ -32,7 +32,7 @@ import org.scalatest.MatchersHelper.orMatchersAndApply
 import org.scalatest.words.MatcherWords
 import scala.collection.GenTraversable
 import scala.util.matching.Regex
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import TripleEqualsSupport.Spread
 import TripleEqualsSupport.TripleEqualsInvocation
 import org.scalatest.FailureMessages
diff --git a/scalatest/src/main/scala/org/scalatest/Assertions.scala b/scalatest/src/main/scala/org/scalatest/Assertions.scala
index 8d79356720..c849d2567f 100644
--- a/scalatest/src/main/scala/org/scalatest/Assertions.scala
+++ b/scalatest/src/main/scala/org/scalatest/Assertions.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, FailureMessages => _, _ }
 import Requirements._
 import ArrayHelper.deep
 import scala.reflect.ClassTag
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala b/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala
index 86c3919ea2..58d774e876 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala
@@ -16,7 +16,7 @@
 package org.scalatest
 
 import org.scalactic.Requirements._
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import org.scalatest.Suite._
 import java.util.ConcurrentModificationException
 import java.util.concurrent.atomic.AtomicReference
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala
index f5182ea47f..d740c4804b 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala
index 04271f6d87..5d952ab11a 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala
index 77e0ea1a08..e8b12748d7 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala
index 70dd8bd964..e3065228fb 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations
 import words.BehaveWord
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala
index 2023680770..94c434ddfa 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ Resources => _, _ }
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations
 
diff --git a/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala
index e042ac3dd7..e9536f1e7c 100644
--- a/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/CompileMacro.scala b/scalatest/src/main/scala/org/scalatest/CompileMacro.scala
index b34ba4247f..f5d8dd0bf5 100644
--- a/scalatest/src/main/scala/org/scalatest/CompileMacro.scala
+++ b/scalatest/src/main/scala/org/scalatest/CompileMacro.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import org.scalatest.words.{TypeCheckWord, CompileWord}
 import scala.reflect.macros.{ Context, TypecheckException, ParseException }
 import org.scalatest.exceptions.StackDepthException
diff --git a/scalatest/src/main/scala/org/scalatest/ConfigMap.scala b/scalatest/src/main/scala/org/scalatest/ConfigMap.scala
index b86e7a260c..c9b5f15a56 100644
--- a/scalatest/src/main/scala/org/scalatest/ConfigMap.scala
+++ b/scalatest/src/main/scala/org/scalatest/ConfigMap.scala
@@ -107,7 +107,10 @@ class ConfigMap(underlying: scala.collection.Map[String, Any]) extends scala.col
 
   override def +[A >: Any](kv: (String, A)): ConfigMap = new ConfigMap(underlying + kv)
 
-  def -(key: String): ConfigMap = new ConfigMap(underlying.filter(_._1 != key))
+  def -(key: String): ConfigMap =
+    new ConfigMap(underlying.filter(_._1 != key))
+  def -(key1: String, key2: String, keys: String*): ConfigMap =
+    new ConfigMap(underlying.filter{case (k, _) => k != key1 && k != key2 && !keys.contains(k)})
 
   override def empty: ConfigMap = new ConfigMap(Map.empty[String, Any])
 
diff --git a/scalatest/src/main/scala/org/scalatest/Engine.scala b/scalatest/src/main/scala/org/scalatest/Engine.scala
index 3d61d7bb72..b0900cb44c 100644
--- a/scalatest/src/main/scala/org/scalatest/Engine.scala
+++ b/scalatest/src/main/scala/org/scalatest/Engine.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import Requirements._
 import org.scalatest.Suite._
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/Fact.scala b/scalatest/src/main/scala/org/scalatest/Fact.scala
index 40d44d78f6..b885defa32 100644
--- a/scalatest/src/main/scala/org/scalatest/Fact.scala
+++ b/scalatest/src/main/scala/org/scalatest/Fact.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ UnquotedString => _, _ }
 import org.scalatest.exceptions.StackDepthException
 import org.scalatest.exceptions.TestFailedException
 import org.scalatest.exceptions.TestCanceledException
diff --git a/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
index fb6cbdb2ea..68823a13d9 100644
--- a/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
index 3a0c3f6a35..4b760d1716 100644
--- a/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
index 3ab7905d44..9954a58a0a 100644
--- a/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.autoTagClassAnnotations
 import words.BehaveWord
 
diff --git a/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala b/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala
index 64c778e1c8..dcffce0216 100644
--- a/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala
+++ b/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala
@@ -22,7 +22,8 @@ private[scalatest] class InsertionOrderSet[A](elements: scala.collection.Seq[A])
   def contains(key: A): Boolean = list.contains(key)
   def iterator: Iterator[A] = list.iterator
   override def +(elem: A) = InsertionOrderSet[A](list :+ elem)
-  def -(elem: A) = InsertionOrderSet[A](list.filter(_ != elem))
+  override def -(elem: A) =
+    InsertionOrderSet[A](list.filter(_ != elem))
   def diff(that: scala.collection.Set[A]): InsertionOrderSet[A] = InsertionOrderSet(elements.diff(that.toSeq))
 }
 
diff --git a/scalatest/src/main/scala/org/scalatest/Inspectors.scala b/scalatest/src/main/scala/org/scalatest/Inspectors.scala
index 82acea2dc8..3c903d91b2 100644
--- a/scalatest/src/main/scala/org/scalatest/Inspectors.scala
+++ b/scalatest/src/main/scala/org/scalatest/Inspectors.scala
@@ -23,7 +23,7 @@ import FailureMessages.decorateToStringValue
 import enablers.Collecting
 import scala.language.higherKinds
 import enablers.InspectorAsserting
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 
 /**
  * Provides nestable <em>inspector methods</em> (or just <em>inspectors</em>) that enable assertions to be made about collections.
diff --git a/scalatest/src/main/scala/org/scalatest/LoneElement.scala b/scalatest/src/main/scala/org/scalatest/LoneElement.scala
index 188d207d0d..7f099143af 100644
--- a/scalatest/src/main/scala/org/scalatest/LoneElement.scala
+++ b/scalatest/src/main/scala/org/scalatest/LoneElement.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, _ }
 import enablers.Collecting
 import exceptions.StackDepthException
 
diff --git a/scalatest/src/main/scala/org/scalatest/Matchers.scala b/scalatest/src/main/scala/org/scalatest/Matchers.scala
index b20e06ed84..ad3e8fdede 100644
--- a/scalatest/src/main/scala/org/scalatest/Matchers.scala
+++ b/scalatest/src/main/scala/org/scalatest/Matchers.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import org.scalatest.enablers._
 import org.scalatest.matchers._
 import org.scalatest.words._
diff --git a/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala b/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
index c316f1c6e7..a6ccdc64b4 100644
--- a/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
+++ b/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
@@ -24,7 +24,7 @@ import scala.util.matching.Regex
 import java.lang.reflect.Field
 import org.scalatest.exceptions.TestFailedException
 import org.scalatest.exceptions.StackDepthException
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 
 // TODO: drop generic support for be as an equality comparison, in favor of specific ones.
 // TODO: mention on JUnit and TestNG docs that you can now mix in ShouldMatchers or MustMatchers
diff --git a/scalatest/src/main/scala/org/scalatest/Outcome.scala b/scalatest/src/main/scala/org/scalatest/Outcome.scala
index 2740bdac5b..5c87b3a4ec 100644
--- a/scalatest/src/main/scala/org/scalatest/Outcome.scala
+++ b/scalatest/src/main/scala/org/scalatest/Outcome.scala
@@ -15,9 +15,9 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import Requirements._
-import org.scalatest.exceptions.StackDepthException
+import exceptions.StackDepthException
 
 /**
  * Superclass for the possible outcomes of running a test.
diff --git a/scalatest/src/main/scala/org/scalatest/Suite.scala b/scalatest/src/main/scala/org/scalatest/Suite.scala
index b6fa1e065b..98dcc9d853 100644
--- a/scalatest/src/main/scala/org/scalatest/Suite.scala
+++ b/scalatest/src/main/scala/org/scalatest/Suite.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import org.scalatest.events._
 import Requirements._
 import exceptions._
diff --git a/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
index e0b16a5d50..2105ed2781 100644
--- a/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ UnquotedString => _, FailureMessages => _, _ }
 import org.scalatest.exceptions._
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala
index 0db09a80db..7538324f2c 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest.fixture
 
-import org.scalatest._
+import org.scalatest.{ AsyncTestSuite => _, _ }
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala
index 7abe5849f0..ad04292576 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest.fixture
 
-import org.scalatest._
+import org.scalatest.{ AsyncTestSuite => _, _ }
 import org.scalactic.source
 import scala.concurrent.Future
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala
index 0042756bc3..4eaac0288b 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala
index 67981cc32a..b1795cda8e 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala
index 168b8f4612..e50d9f49d4 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import scala.concurrent.Future
 import org.scalatest.Suite.autoTagClassAnnotations
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala
index d045f67667..de9b98acac 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
index 91c452b51d..769fb1b531 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
index c2dccb16fd..ce827d6e38 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import java.util.ConcurrentModificationException
 import java.util.concurrent.atomic.AtomicReference
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
index 095a2a1538..2b604a6735 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
index f5eb64123d..b9e7822f70 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
index 7207286685..c8901367da 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import org.scalatest.Suite.autoTagClassAnnotations
 
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
index e5643a3407..ae4c507ecf 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import org.scalatest.Suite.autoTagClassAnnotations
 
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
index 2f0a907504..f26aa3f91c 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import Spec._
 import Suite._
diff --git a/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
index 934c0fd995..0f99cd8ca0 100644
--- a/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
+++ b/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException
diff --git a/scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala b/scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
index 6e747cef59..205abc9c3e 100644
--- a/scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
+++ b/scalatest/src/main/scala/org/scalatest/tools/ScalaTestFramework.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.tools
+package org.scalatest
+package tools
 
-import org.scalatest._
 import ArgsParser._
 import SuiteDiscoveryHelper._
 import java.util.concurrent.atomic.AtomicBoolean
@@ -208,7 +208,7 @@ class ScalaTestFramework extends SbtFramework {
 
           val module = runtimeMirror.staticModule("org.scalatest.tools.Runner$")
           val obj = runtimeMirror.reflectModule(module)
-          val runnerInstance = obj.instance.asInstanceOf[Runner.type]
+          val runnerInstance = obj.instance.asInstanceOf[org.scalatest.tools.Runner.type]
 
           runnerInstance.spanScaleFactor = parseDoubleArgument(spanScaleFactors, "-F", 1.0)
           
diff --git a/scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala b/scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala
index 04ec579d6e..549fd1c51e 100644
--- a/scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala
+++ b/scalatest/src/main/scala/org/scalatest/words/JavaMapWrapper.scala
@@ -59,6 +59,13 @@ private[scalatest] class JavaMapWrapper[K, V](val underlying: java.util.Map[K, V
     newJavaMap.remove(key)
     new JavaMapWrapper[K, V](underlying)
   }
+  def - (key1: K, key2: K, keys: K*): scala.collection.Map[K, V] = {
+    val newJavaMap = new java.util.LinkedHashMap[K, V](underlying)
+    newJavaMap.remove(key1)
+    newJavaMap.remove(key2)
+    keys.foreach(newJavaMap.remove)
+    new JavaMapWrapper[K, V](underlying)
+  }
   override def empty = new JavaMapWrapper[K, V](new java.util.LinkedHashMap[K, V]())
   override def toString: String = if (underlying == null) "null" else underlying.toString
 }