diff --git a/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTest.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTest.java
index a196a13d..da3c6d91 100755
--- a/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTest.java
+++ b/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTest.java
@@ -71,7 +71,6 @@ public abstract class ObjectAbstractTest {
         // TODO: What more can we test?
     }
 
-    // TODO: assert that either BOTH or NONE of equals/hashcode is overridden
     @Test
     public void testEqualsHashCode(){
         Object obj = makeObject();
diff --git a/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTest.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTest.java
index dd8652bf..fe0ed34b 100755
--- a/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTest.java
+++ b/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTest.java
@@ -1255,6 +1255,7 @@ public abstract class MapAbstractTest extends ObjectAbstractTest {
     }
     */
 
+    @Nested
     public class TestMapEntrySet extends SetAbstractTest {
 
         // Have to implement manually; entrySet doesn't support addAll
@@ -1429,6 +1430,7 @@ public abstract class MapAbstractTest extends ObjectAbstractTest {
     }
     */
 
+    @Nested
     public class TestMapKeySet extends SetAbstractTest {
         public Object[] getFullElements() {
             return getSampleKeys();
@@ -1495,6 +1497,7 @@ public abstract class MapAbstractTest extends ObjectAbstractTest {
     }
     */
 
+    @Nested
     public class TestMapValues extends CollectionAbstractTest {
         public Object[] getFullElements() {
             return getSampleValues();