From d6b7985a99e401c870183b15d919155f1f265006 Mon Sep 17 00:00:00 2001
From: "Craig P. Motlin" <cmotlin@gmail.com>
Date: Mon, 21 Feb 2022 00:13:21 -0500
Subject: [PATCH] Implement missing implementations of toString(), fixing an
 issue mentioned in #1196. Also optimize some implementations of toString()
 that were delegating to iterators.

Signed-off-by: Craig P. Motlin <cmotlin@gmail.com>
---
 .../bimap/mutable/AbstractMutableBiMap.java   |  18 ++-
 .../impl/bimap/mutable/SynchronizedBiMap.java |  14 --
 .../map/AbstractSynchronizedMapIterable.java  |  22 ++-
 .../map/mutable/SynchronizedMutableMap.java   |  16 +-
 .../impl/map/mutable/UnifiedMap.java          |  28 +++-
 .../sorted/mutable/SynchronizedSortedMap.java |  16 +-
 .../UnifiedMapWithHashingStrategy.java        |  28 +++-
 .../collections/impl/utility/Iterate.java     |   7 +-
 unit-tests-java8/pom.xml                      |   9 +-
 .../collections/test/IterableTestCase.java    |   4 +-
 .../MutableSortedNaturalOrderTestCase.java    |  40 ++---
 .../test/RichIterableTestCase.java            |   7 +-
 .../test/RichIterableUniqueTestCase.java      |  17 ++-
 .../RichIterableWithDuplicatesTestCase.java   |   2 +-
 .../test/SortedNaturalOrderTestCase.java      |  24 +--
 .../test/UnorderedIterableTestCase.java       |   9 +-
 .../test/bag/UnsortedBagTestCase.java         |  11 +-
 .../MutableSortedBagNoComparatorTestCase.java |  35 ++++-
 .../sorted/TreeBagNoComparatorTest.java       |  38 +----
 .../collections/test/bimap/BiMapTestCase.java |  88 ++++++++++-
 .../test/bimap/UnsortedBiMapTestCase.java     |  39 ++---
 .../ImmutableHashBiMapInverseTest.java        |  27 +++-
 .../immutable/ImmutableHashBiMapTest.java     |  21 ++-
 .../ImmutableUnsortedBiMapTestCase.java       |   8 +-
 .../bimap/mutable/HashBiMapInverseTest.java   |  26 +++-
 .../mutable/HashBiMapNoIteratorTest.java      | 144 ++++++++++++++++++
 .../test/bimap/mutable/HashBiMapTest.java     |  23 ++-
 .../mutable/MutableUnsortedBiMapTestCase.java |  21 ++-
 .../bimap/mutable/UnmodifiableBiMapTest.java  |  21 ++-
 .../collections/test/list/ListTestCase.java   |   8 +
 .../list/mutable/MutableListTestCase.java     |   6 +
 .../test/map/MapIterableTestCase.java         |  30 +++-
 .../test/map/OrderedMapIterableTestCase.java  |  10 --
 .../test/map/SortedMapIterableTestCase.java   |  13 +-
 .../test/map/UnsortedMapIterableTestCase.java |  43 +++---
 .../mutable/MutableMapIterableTestCase.java   |  12 ++
 .../test/map/mutable/MutableMapTestCase.java  |  18 ++-
 .../collections/test/set/SetTestCase.java     |   8 +-
 .../test/set/UnsortedSetIterableTestCase.java |  20 +--
 .../test/set/UnsortedSetLikeTestTrait.java    |  11 +-
 .../test/set/mutable/MutableSetTestCase.java  |   8 +-
 41 files changed, 666 insertions(+), 284 deletions(-)
 create mode 100755 unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapNoIteratorTest.java

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
index 8d793a375d..5dfa465c0f 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -728,7 +728,7 @@ public void remove()
         }
     }
 
-    private class KeySet implements Set<K>, Serializable
+    protected class KeySet implements Set<K>, Serializable
     {
         @Override
         public boolean equals(Object obj)
@@ -847,7 +847,7 @@ public Iterator<K> iterator()
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            return AbstractMutableBiMap.this.delegate.keySet().toString();
         }
 
         protected Object writeReplace()
@@ -858,7 +858,7 @@ protected Object writeReplace()
         }
     }
 
-    private class ValuesCollection implements Collection<V>
+    protected class ValuesCollection implements Collection<V>
     {
         @Override
         public int size()
@@ -965,11 +965,11 @@ public Iterator<V> iterator()
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            return AbstractMutableBiMap.this.delegate.values().toString();
         }
     }
 
-    private class EntrySet implements Set<Map.Entry<K, V>>
+    protected class EntrySet implements Set<Map.Entry<K, V>>
     {
         @Override
         public boolean equals(Object obj)
@@ -991,6 +991,12 @@ public int hashCode()
             return AbstractMutableBiMap.this.hashCode();
         }
 
+        @Override
+        public String toString()
+        {
+            return AbstractMutableBiMap.this.delegate.entrySet().toString();
+        }
+
         @Override
         public int size()
         {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/SynchronizedBiMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/SynchronizedBiMap.java
index c73eed16d0..2aa85b0e0e 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/SynchronizedBiMap.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/SynchronizedBiMap.java
@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.bimap.ImmutableBiMap;
 import org.eclipse.collections.api.bimap.MutableBiMap;
 import org.eclipse.collections.api.block.function.Function;
@@ -36,7 +35,6 @@
 import org.eclipse.collections.impl.map.AbstractSynchronizedMapIterable;
 import org.eclipse.collections.impl.map.mutable.SynchronizedBiMapSerializationProxy;
 import org.eclipse.collections.impl.set.mutable.SynchronizedMutableSet;
-import org.eclipse.collections.impl.utility.LazyIterate;
 
 public class SynchronizedBiMap<K, V> extends AbstractSynchronizedMapIterable<K, V> implements MutableBiMap<K, V>, Serializable
 {
@@ -269,18 +267,6 @@ public MutableBiMap<V, K> flipUniqueValues()
         }
     }
 
-    @Override
-    public RichIterable<K> keysView()
-    {
-        return LazyIterate.adapt(this.keySet());
-    }
-
-    @Override
-    public RichIterable<V> valuesView()
-    {
-        return LazyIterate.adapt(this.values());
-    }
-
     @Override
     public ImmutableBiMap<K, V> toImmutable()
     {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/AbstractSynchronizedMapIterable.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/AbstractSynchronizedMapIterable.java
index 14848c582e..9dc7a5843c 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/AbstractSynchronizedMapIterable.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/AbstractSynchronizedMapIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -37,7 +37,6 @@
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.collection.AbstractSynchronizedRichIterable;
 import org.eclipse.collections.impl.tuple.AbstractImmutableEntry;
-import org.eclipse.collections.impl.utility.Iterate;
 import org.eclipse.collections.impl.utility.LazyIterate;
 
 /**
@@ -350,15 +349,22 @@ public <K1, V1, V2> MutableMapIterable<K1, V2> aggregateBy(
         }
     }
 
+    @Override
+    public RichIterable<K> keysView()
+    {
+        return LazyIterate.adapt(this.keySet());
+    }
+
+    @Override
+    public RichIterable<V> valuesView()
+    {
+        return LazyIterate.adapt(this.values());
+    }
+
     @Override
     public RichIterable<Pair<K, V>> keyValuesView()
     {
-        synchronized (this.lock)
-        {
-            Set<Entry<K, V>> entries = this.getDelegate().entrySet();
-            Iterable<Pair<K, V>> pairs = Iterate.collect(entries, AbstractImmutableEntry.getPairFunction());
-            return LazyIterate.adapt(pairs);
-        }
+        return LazyIterate.adapt(this.entrySet()).collect(AbstractImmutableEntry.getPairFunction());
     }
 
     @Override
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/SynchronizedMutableMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/SynchronizedMutableMap.java
index 008c5bcfd4..4b35b128ff 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/SynchronizedMutableMap.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/SynchronizedMutableMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.bag.MutableBag;
 import org.eclipse.collections.api.bag.primitive.MutableBooleanBag;
 import org.eclipse.collections.api.bag.primitive.MutableByteBag;
@@ -54,7 +53,6 @@
 import org.eclipse.collections.impl.list.fixed.ArrayAdapter;
 import org.eclipse.collections.impl.map.AbstractSynchronizedMapIterable;
 import org.eclipse.collections.impl.set.mutable.SynchronizedMutableSet;
-import org.eclipse.collections.impl.utility.LazyIterate;
 
 /**
  * A synchronized view of a {@link MutableMap}. It is imperative that the user manually synchronize on the collection when iterating over it using the
@@ -489,18 +487,6 @@ public Set<Entry<K, V>> entrySet()
         }
     }
 
-    @Override
-    public RichIterable<K> keysView()
-    {
-        return LazyIterate.adapt(this.keySet());
-    }
-
-    @Override
-    public RichIterable<V> valuesView()
-    {
-        return LazyIterate.adapt(this.values());
-    }
-
     @Override
     public MutableMap<K, V> asUnmodifiable()
     {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java
index 91833f8088..9d9b9ebbb3 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -42,6 +42,7 @@
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.block.factory.Functions;
 import org.eclipse.collections.impl.block.factory.Predicates;
+import org.eclipse.collections.impl.block.procedure.AppendStringProcedure;
 import org.eclipse.collections.impl.block.procedure.MapCollectProcedure;
 import org.eclipse.collections.impl.list.mutable.FastList;
 import org.eclipse.collections.impl.parallel.BatchIterable;
@@ -2346,7 +2347,12 @@ public int hashCode()
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<K> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
         }
 
         @Override
@@ -2897,6 +2903,17 @@ public int hashCode()
         {
             return UnifiedMap.this.hashCode();
         }
+
+        @Override
+        public String toString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<Entry<K, V>> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
+        }
     }
 
     protected class EntrySetIterator extends PositionalIterator<Entry<K, V>>
@@ -3228,7 +3245,12 @@ private void chainedAddToList(Object[] chain, FastList<V> replace)
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<V> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
         }
     }
 
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/SynchronizedSortedMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/SynchronizedSortedMap.java
index 35243f9636..3359fc4bc6 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/SynchronizedSortedMap.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/SynchronizedSortedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,7 +18,6 @@
 import java.util.SortedMap;
 
 import org.eclipse.collections.api.LazyIterable;
-import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.block.function.Function;
 import org.eclipse.collections.api.block.function.Function2;
 import org.eclipse.collections.api.block.function.primitive.BooleanFunction;
@@ -63,7 +62,6 @@
 import org.eclipse.collections.impl.map.AbstractSynchronizedMapIterable;
 import org.eclipse.collections.impl.map.mutable.SynchronizedMapSerializationProxy;
 import org.eclipse.collections.impl.set.mutable.SynchronizedMutableSet;
-import org.eclipse.collections.impl.utility.LazyIterate;
 
 /**
  * A synchronized view of a SortedMap.
@@ -507,18 +505,6 @@ public <R> MutableSortedMap<K, R> collectValues(Function2<? super K, ? super V,
         }
     }
 
-    @Override
-    public RichIterable<K> keysView()
-    {
-        return LazyIterate.adapt(this.keySet());
-    }
-
-    @Override
-    public RichIterable<V> valuesView()
-    {
-        return LazyIterate.adapt(this.values());
-    }
-
     @Override
     public MutableSortedMap<K, V> asUnmodifiable()
     {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
index 076f8b94d0..50bfc34059 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -39,6 +39,7 @@
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.block.factory.Functions;
 import org.eclipse.collections.impl.block.factory.Predicates;
+import org.eclipse.collections.impl.block.procedure.AppendStringProcedure;
 import org.eclipse.collections.impl.block.procedure.MapCollectProcedure;
 import org.eclipse.collections.impl.factory.HashingStrategyMaps;
 import org.eclipse.collections.impl.list.mutable.FastList;
@@ -1959,7 +1960,12 @@ public int hashCode()
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<K> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
         }
 
         @Override
@@ -2513,6 +2519,17 @@ public int hashCode()
         {
             return UnifiedMapWithHashingStrategy.this.hashCode();
         }
+
+        @Override
+        public String toString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<Entry<K, V>> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
+        }
     }
 
     protected class EntrySetIterator extends PositionalIterator<Entry<K, V>>
@@ -2852,7 +2869,12 @@ private void chainedAddToList(Object[] chain, FastList<V> replace)
         @Override
         public String toString()
         {
-            return Iterate.makeString(this, "[", ", ", "]");
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append('[');
+            Procedure<V> appendStringProcedure = new AppendStringProcedure<>(stringBuilder, ", ");
+            this.forEach(appendStringProcedure);
+            stringBuilder.append(']');
+            return stringBuilder.toString();
         }
     }
 
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java
index 42326f4630..848eb382c6 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -86,6 +86,7 @@
 import org.eclipse.collections.impl.multimap.bag.HashBagMultimap;
 import org.eclipse.collections.impl.multimap.list.FastListMultimap;
 import org.eclipse.collections.impl.multimap.set.UnifiedSetMultimap;
+import org.eclipse.collections.impl.parallel.BatchIterable;
 import org.eclipse.collections.impl.utility.internal.DefaultSpeciesNewStrategy;
 import org.eclipse.collections.impl.utility.internal.IterableIterate;
 import org.eclipse.collections.impl.utility.internal.RandomAccessListIterate;
@@ -130,6 +131,10 @@ public static <T> void forEach(Iterable<T> iterable, Procedure<? super T> proced
         {
             ((InternalIterable<T>) iterable).forEach(procedure);
         }
+        else if (iterable instanceof BatchIterable)
+        {
+            ((BatchIterable<T>) iterable).forEach(procedure);
+        }
         else if (iterable instanceof ArrayList)
         {
             ArrayListIterate.forEach((ArrayList<T>) iterable, procedure);
diff --git a/unit-tests-java8/pom.xml b/unit-tests-java8/pom.xml
index e4fda8a670..16013e8b8e 100644
--- a/unit-tests-java8/pom.xml
+++ b/unit-tests-java8/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright (c) 2021 Goldman Sachs.
+  ~ Copyright (c) 2022 Goldman Sachs and others.
   ~ All rights reserved. This program and the accompanying materials
   ~ are made available under the terms of the Eclipse Public License v1.0
   ~ and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -58,6 +58,13 @@
             <artifactId>junit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/IterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/IterableTestCase.java
index 9c9db93510..c95b721e45 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/IterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/IterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -263,4 +263,6 @@ default void Iterable_next_throws_at_end()
     }
 
     void Iterable_remove();
+
+    void Iterable_toString();
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/MutableSortedNaturalOrderTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/MutableSortedNaturalOrderTestCase.java
index 0e029f2b9c..59e43b932e 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/MutableSortedNaturalOrderTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/MutableSortedNaturalOrderTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,9 +18,13 @@
 import org.eclipse.collections.impl.block.factory.Predicates2;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.collection.mutable.MutableCollectionTestCase;
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
 public interface MutableSortedNaturalOrderTestCase extends SortedNaturalOrderTestCase, MutableOrderedIterableTestCase, MutableCollectionTestCase
 {
     @Test
@@ -31,7 +35,7 @@ default void Iterable_remove()
         Iterator<Integer> iterator = iterable.iterator();
         iterator.next();
         iterator.remove();
-        IterableTestCase.assertEquals(this.newWith(1, 1, 2, 2, 3), iterable);
+        assertEquals(this.newWith(1, 1, 2, 2, 3), iterable);
     }
 
     @Override
@@ -39,17 +43,17 @@ default void Iterable_remove()
     default void MutableCollection_removeIf()
     {
         MutableCollection<Integer> collection1 = this.newWith(1, 1, 2, 2, 3, 3, 4, 4, 5, 5);
-        Assert.assertTrue(collection1.removeIf(Predicates.cast(each -> each % 2 == 0)));
-        IterableTestCase.assertEquals(this.getExpectedFiltered(1, 1, 3, 3, 5, 5), collection1);
+        assertTrue(collection1.removeIf(Predicates.cast(each -> each % 2 == 0)));
+        assertEquals(this.getExpectedFiltered(1, 1, 3, 3, 5, 5), collection1);
 
         MutableCollection<Integer> collection2 = this.newWith(1, 2, 3, 4);
-        Assert.assertFalse(collection2.removeIf(Predicates.equal(5)));
-        Assert.assertTrue(collection2.removeIf(Predicates.greaterThan(0)));
-        Assert.assertEquals(this.newWith(), collection2);
-        Assert.assertFalse(collection2.removeIf(Predicates.greaterThan(2)));
+        assertFalse(collection2.removeIf(Predicates.equal(5)));
+        assertTrue(collection2.removeIf(Predicates.greaterThan(0)));
+        assertEquals(this.newWith(), collection2);
+        assertFalse(collection2.removeIf(Predicates.greaterThan(2)));
 
         Predicate<Object> predicate = null;
-        Assert.assertThrows(NullPointerException.class, () -> this.newWith(1, 4, 5, 7).removeIf(predicate));
+        assertThrows(NullPointerException.class, () -> this.newWith(1, 4, 5, 7).removeIf(predicate));
     }
 
     @Override
@@ -57,16 +61,16 @@ default void MutableCollection_removeIf()
     default void MutableCollection_removeIfWith()
     {
         MutableCollection<Integer> collection = this.newWith(1, 1, 2, 2, 3, 3, 4, 4, 5, 5);
-        Assert.assertTrue(collection.removeIfWith(Predicates2.in(), Lists.immutable.with(5, 3, 1)));
-        IterableTestCase.assertEquals(this.getExpectedFiltered(2, 2, 4, 4), collection);
-        Assert.assertThrows(NullPointerException.class, () -> this.newWith(7, 4, 5, 1).removeIfWith(null, this));
+        assertTrue(collection.removeIfWith(Predicates2.in(), Lists.immutable.with(5, 3, 1)));
+        assertEquals(this.getExpectedFiltered(2, 2, 4, 4), collection);
+        assertThrows(NullPointerException.class, () -> this.newWith(7, 4, 5, 1).removeIfWith(null, this));
 
         MutableCollection<Integer> collection2 = this.newWith(1, 2, 3, 4);
-        Assert.assertFalse(collection2.removeIfWith(Predicates2.equal(), 5));
-        Assert.assertTrue(collection2.removeIfWith(Predicates2.greaterThan(), 0));
-        Assert.assertEquals(this.newWith(), collection2);
-        Assert.assertFalse(collection2.removeIfWith(Predicates2.greaterThan(), 2));
+        assertFalse(collection2.removeIfWith(Predicates2.equal(), 5));
+        assertTrue(collection2.removeIfWith(Predicates2.greaterThan(), 0));
+        assertEquals(this.newWith(), collection2);
+        assertFalse(collection2.removeIfWith(Predicates2.greaterThan(), 2));
 
-        Assert.assertThrows(NullPointerException.class, () -> this.newWith(1, 4, 5, 7).removeIfWith(null, null));
+        assertThrows(NullPointerException.class, () -> this.newWith(1, 4, 5, 7).removeIfWith(null, null));
     }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java
index 52dc24b719..889b394ebb 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -2055,12 +2055,15 @@ default void RichIterable_makeString_appendString()
     }
 
     @Test
-    default void RichIterable_toString()
+    default void Iterable_toString()
     {
         RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
         assertEquals(
                 "[4, 4, 4, 4, 3, 3, 3, 2, 2, 1]",
                 iterable.toString());
+        assertEquals(
+                "[4, 4, 4, 4, 3, 3, 3, 2, 2, 1]",
+                iterable.asLazy().toString());
     }
 
     @Test
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableUniqueTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableUniqueTestCase.java
index 119ead39a6..49957107b1 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableUniqueTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableUniqueTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -106,6 +106,14 @@ default void Iterable_sanity_check()
         assertThrows(IllegalStateException.class, () -> this.newWith(s, s));
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 2, 1);
+        Assert.assertEquals("[3, 2, 1]", iterable.toString());
+        Assert.assertEquals("[3, 2, 1]", iterable.asLazy().toString());
+    }
+
     @Override
     @Test
     default void InternalIterable_forEach()
@@ -905,13 +913,6 @@ default void RichIterable_makeString_appendString()
         assertEquals("[4/3/2/1]", stringBuilder3.toString());
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        assertEquals("[4, 3, 2, 1]", this.newWith(4, 3, 2, 1).toString());
-    }
-
     @Override
     @Test
     default void RichIterable_toList()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableWithDuplicatesTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableWithDuplicatesTestCase.java
index 5a09301601..57660278a0 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableWithDuplicatesTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableWithDuplicatesTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/SortedNaturalOrderTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/SortedNaturalOrderTestCase.java
index c0018d2961..97512ebec4 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/SortedNaturalOrderTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/SortedNaturalOrderTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -47,6 +47,18 @@
 
 public interface SortedNaturalOrderTestCase extends OrderedIterableTestCase
 {
+    @Test
+    default void Iterable_toString()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                "[1, 2, 2, 3, 3, 3, 4, 4, 4, 4]",
+                iterable.toString());
+        assertEquals(
+                "[1, 2, 2, 3, 3, 3, 4, 4, 4, 4]",
+                iterable.asLazy().toString());
+    }
+
     @Override
     @Test
     default void RichIterable_collect()
@@ -329,16 +341,6 @@ default void RichIterable_makeString_appendString()
                 builder3.toString());
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        RichIterable<Integer> iterable = this.newWith(1, 2, 2, 3, 3, 3, 4, 4, 4, 4);
-        assertEquals(
-                "[1, 2, 2, 3, 3, 3, 4, 4, 4, 4]",
-                iterable.toString());
-    }
-
     @Override
     @Test
     default void RichIterable_toList()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/UnorderedIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/UnorderedIterableTestCase.java
index 89e4fb9c2b..f803e3feae 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/UnorderedIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/UnorderedIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,6 +18,7 @@
 import org.eclipse.collections.api.collection.MutableCollection;
 import org.eclipse.collections.impl.block.factory.Predicates;
 import org.eclipse.collections.impl.block.factory.Predicates2;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;
@@ -49,6 +50,12 @@ default void Iterable_next()
         assertFalse(iterator.hasNext());
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        MatcherAssert.assertThat(this.newWith(2, 2, 1).toString(), isOneOf("[2, 2, 1]", "[1, 2, 2]"));
+    }
+
     @Override
     @Test
     default void RichIterable_getFirst()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/UnsortedBagTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/UnsortedBagTestCase.java
index 09669ced84..1144521969 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/UnsortedBagTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/UnsortedBagTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -20,9 +20,9 @@
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isOneOf;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 
 public interface UnsortedBagTestCase extends UnorderedIterableTestCase, BagTestCase, TransformsToBagTrait
 {
@@ -76,13 +76,6 @@ default void RichIterable_makeString_appendString()
         assertThat(builder3.toString(), isOneOf("[2/2/1]", "[1/2/2]"));
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        assertThat(this.newWith(2, 2, 1).toString(), isOneOf("[2, 2, 1]", "[1, 2, 2]"));
-    }
-
     @Override
     @Test
     default void RichIterable_toList()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/MutableSortedBagNoComparatorTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/MutableSortedBagNoComparatorTestCase.java
index c52e54ef22..83602a0292 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/MutableSortedBagNoComparatorTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/MutableSortedBagNoComparatorTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -10,9 +10,13 @@
 
 package org.eclipse.collections.test.bag.mutable.sorted;
 
+import java.util.Objects;
+import java.util.Optional;
+
 import org.eclipse.collections.api.bag.sorted.MutableSortedBag;
 import org.eclipse.collections.api.bag.sorted.SortedBag;
 import org.eclipse.collections.api.list.MutableList;
+import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.impl.bag.sorted.mutable.TreeBag;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.MutableSortedNaturalOrderTestCase;
@@ -21,6 +25,8 @@
 import static org.eclipse.collections.test.IterableTestCase.addAllTo;
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 public interface MutableSortedBagNoComparatorTestCase extends SortedBagTestCase, MutableBagIterableTestCase, MutableSortedNaturalOrderTestCase
@@ -42,6 +48,33 @@ default <T> MutableSortedBag<T> newMutableForFilter(T... elements)
         return result;
     }
 
+    @Override
+    @Test
+    default void RichIterable_minByOptional_maxByOptional()
+    {
+        assertEquals(Optional.of("ca"), this.newWith("ed", "da", "ca", "bc", "ab").minByOptional(string -> string.charAt(string.length() - 1)));
+        assertSame(Optional.empty(), this.<String>newWith().minByOptional(string -> string.charAt(string.length() - 1)));
+        assertThrows(NullPointerException.class, () -> this.newWith(new Object[]{null}).minByOptional(Objects::isNull));
+
+        assertEquals(Optional.of("cz"), this.newWith("ew", "dz", "cz", "bx", "ay").maxByOptional(string -> string.charAt(string.length() - 1)));
+        assertSame(Optional.empty(), this.<String>newWith().maxByOptional(string -> string.charAt(string.length() - 1)));
+        assertThrows(NullPointerException.class, () -> this.newWith(new Object[]{null}).maxByOptional(Objects::isNull));
+    }
+
+    @Override
+    @Test
+    default void OrderedIterable_getFirstOptional()
+    {
+        assertEquals(Optional.of(Integer.valueOf(1)), ((OrderedIterable<?>) this.newWith(3, 3, 3, 2, 2, 1)).getFirstOptional());
+    }
+
+    @Override
+    @Test
+    default void OrderedIterable_getLastOptional()
+    {
+        assertEquals(Optional.of(Integer.valueOf(3)), ((OrderedIterable<?>) this.newWith(3, 3, 3, 2, 2, 1)).getLastOptional());
+    }
+
     @Override
     @Test
     default void Bag_toStringOfItemToCount()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/TreeBagNoComparatorTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/TreeBagNoComparatorTest.java
index 98548bca1c..4686ca75f1 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/TreeBagNoComparatorTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bag/mutable/sorted/TreeBagNoComparatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -10,21 +10,12 @@
 
 package org.eclipse.collections.test.bag.mutable.sorted;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.eclipse.collections.api.bag.sorted.MutableSortedBag;
-import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.impl.bag.sorted.mutable.TreeBag;
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.eclipse.collections.test.IterableTestCase;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.eclipse.collections.test.IterableTestCase.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-
 @RunWith(Java8Runner.class)
 public class TreeBagNoComparatorTest implements MutableSortedBagNoComparatorTestCase
 {
@@ -36,31 +27,4 @@ public final <T> MutableSortedBag<T> newWith(T... elements)
         IterableTestCase.addAllTo(elements, result);
         return result;
     }
-
-    @Override
-    @Test
-    public void OrderedIterable_getFirstOptional()
-    {
-        assertEquals(Optional.of(Integer.valueOf(1)), ((OrderedIterable<?>) this.newWith(3, 3, 3, 2, 2, 1)).getFirstOptional());
-    }
-
-    @Override
-    @Test
-    public void OrderedIterable_getLastOptional()
-    {
-        assertEquals(Optional.of(Integer.valueOf(3)), ((OrderedIterable<?>) this.newWith(3, 3, 3, 2, 2, 1)).getLastOptional());
-    }
-
-    @Override
-    @Test
-    public void RichIterable_minByOptional_maxByOptional()
-    {
-        assertEquals(Optional.of("ca"), this.newWith("ed", "da", "ca", "bc", "ab").minByOptional(string -> string.charAt(string.length() - 1)));
-        assertSame(Optional.empty(), this.<String>newWith().minByOptional(string -> string.charAt(string.length() - 1)));
-        assertThrows(NullPointerException.class, () -> this.newWith(new Object[]{null}).minByOptional(Objects::isNull));
-
-        assertEquals(Optional.of("cz"), this.newWith("ew", "dz", "cz", "bx", "ay").maxByOptional(string -> string.charAt(string.length() - 1)));
-        assertSame(Optional.empty(), this.<String>newWith().maxByOptional(string -> string.charAt(string.length() - 1)));
-        assertThrows(NullPointerException.class, () -> this.newWith(new Object[]{null}).maxByOptional(Objects::isNull));
-    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/BiMapTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/BiMapTestCase.java
index dc2c56239f..3b8e88445c 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/BiMapTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/BiMapTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -11,17 +11,101 @@
 package org.eclipse.collections.test.bimap;
 
 import org.eclipse.collections.api.bimap.BiMap;
+import org.eclipse.collections.api.collection.MutableCollection;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.RichIterableUniqueTestCase;
+import org.eclipse.collections.test.map.MapIterableTestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
 
-public interface BiMapTestCase extends RichIterableUniqueTestCase
+public interface BiMapTestCase extends RichIterableUniqueTestCase, MapIterableTestCase
 {
     @Override
     <T> BiMap<Object, T> newWith(T... elements);
 
+    @Override
+    <K, V> BiMap<K, V> newWithKeysValues(Object... elements);
+
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Test
+    default void Iterable_sanity_check()
+    {
+        // Intentionally blank
+    }
+
+    @Override
+    default void Iterable_toString()
+    {
+        RichIterableUniqueTestCase.super.Iterable_toString();
+
+        BiMap<String, Integer> bimap = this.newWithKeysValues("Two", 2, "One", 1);
+        Assert.assertEquals("{Two=2, One=1}", bimap.toString());
+        Assert.assertEquals("[Two, One]", bimap.keysView().toString());
+        Assert.assertEquals("[2, 1]", bimap.valuesView().toString());
+        Assert.assertEquals("[Two:2, One:1]", bimap.keyValuesView().toString());
+        Assert.assertEquals("[2, 1]", bimap.asLazy().toString());
+
+        Assert.assertEquals(
+                "{10=4, 9=4, 8=4, 7=4, 6=3, 5=3, 4=3, 3=2, 2=2, 1=1}",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).toString());
+        Assert.assertEquals(
+                "[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).keysView().toString());
+        Assert.assertEquals(
+                "[4, 4, 4, 4, 3, 3, 3, 2, 2, 1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).valuesView().toString());
+        Assert.assertEquals(
+                "[10:4, 9:4, 8:4, 7:4, 6:3, 5:3, 4:3, 3:2, 2:2, 1:1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).keyValuesView().toString());
+    }
+
+    @Override
+    default void MapIterable_forEachKeyValue()
+    {
+        BiMap<Object, Integer> bimap = this.newWith(3, 2, 1);
+        MutableCollection<Integer> forEachKeyValue = this.newMutableForFilter();
+        bimap.forEachKeyValue((key, value) -> forEachKeyValue.add(value + 10));
+        assertEquals(this.newMutableForFilter(13, 13, 13, 12, 12, 11), forEachKeyValue);
+
+        BiMap<Integer, String> bimap2 = this.newWithKeysValues(3, "Three", 2, "Two", 1, "One");
+        MutableCollection<String> forEachKeyValue2 = this.newMutableForFilter();
+        bimap2.forEachKeyValue((key, value) -> forEachKeyValue2.add(key + value));
+        assertEquals(this.newMutableForFilter("3Three", "2Two", "1One"), forEachKeyValue2);
+
+        MutableCollection<Integer> forEachValue = this.newMutableForFilter();
+        bimap.forEachValue(value -> forEachValue.add(value + 10));
+        assertEquals(this.newMutableForFilter(13, 13, 13, 12, 12, 11), forEachValue);
+
+        MutableCollection<Object> forEachKey = this.newMutableForFilter();
+        bimap2.forEachKey(key -> forEachKey.add(key + 1));
+        assertEquals(this.newMutableForFilter(4, 3, 2), forEachKey);
+    }
+
+    @Override
+    default void MapIterable_flipUniqueValues()
+    {
+        BiMap<String, Integer> bimap = this.newWithKeysValues("Three", 3, "Two", 2, "One", 1);
+        BiMap<Integer, String> result = bimap.flipUniqueValues();
+
+        assertEquals(
+                this.newWithKeysValues(3, "Three", 2, "Two", 1, "One"),
+                result);
+    }
+
+    @Override
+    default void RichIterable_size()
+    {
+        RichIterableUniqueTestCase.super.RichIterable_size();
+    }
+
     default void BiMap_toList()
     {
         BiMap<Object, Integer> iterable = this.newWith(4, 3, 2, 1);
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/UnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/UnsortedBiMapTestCase.java
index 8eeebf128f..22653f0c31 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/UnsortedBiMapTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/UnsortedBiMapTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -11,27 +11,35 @@
 package org.eclipse.collections.test.bimap;
 
 import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.eclipse.collections.api.bimap.BiMap;
 import org.eclipse.collections.api.set.MutableSet;
-import org.eclipse.collections.impl.factory.Bags;
 import org.eclipse.collections.impl.factory.Sets;
 import org.eclipse.collections.test.bag.TransformsToBagTrait;
 import org.eclipse.collections.test.set.UnsortedSetLikeTestTrait;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isOneOf;
-import static org.junit.Assert.assertThat;
 
 public interface UnsortedBiMapTestCase extends BiMapTestCase, TransformsToBagTrait, UnsortedSetLikeTestTrait
 {
     @Override
     <T> BiMap<Object, T> newWith(T... elements);
 
+    @Override
+    default void Iterable_toString()
+    {
+        BiMap<String, Integer> bimap = this.newWithKeysValues("Two", 2, "One", 1);
+
+        assertThat(bimap.toString(), isOneOf("{One=1, Two=2}", "{Two=2, One=1}"));
+        assertThat(bimap.keysView().toString(), isOneOf("[One, Two]", "[Two, One]"));
+        assertThat(bimap.valuesView().toString(), isOneOf("[1, 2]", "[2, 1]"));
+        assertThat(bimap.keyValuesView().toString(), isOneOf("[One:1, Two:2]", "[Two:2, One:1]"));
+        assertThat(bimap.asLazy().toString(), isOneOf("[1, 2]", "[2, 1]"));
+    }
+
     @Test
     @Override
     default void Iterable_remove()
@@ -49,23 +57,4 @@ default void Iterable_remove()
                         Sets.immutable.with(3, 1),
                         Sets.immutable.with(2, 1)));
     }
-
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        String string = this.newWith(3, 2, 1).toString();
-        Pattern pattern = Pattern.compile("^\\{\\d\\.\\d+(E-\\d)?=(\\d),"
-                + " \\d\\.\\d+(E-\\d)?=(\\d),"
-                + " \\d\\.\\d+(E-\\d)?=(\\d)\\}$");
-        Matcher matcher = pattern.matcher(string);
-        Assert.assertTrue(string, matcher.matches());
-
-        assertEquals(
-                Bags.immutable.with("1", "2", "3"),
-                Bags.immutable.with(
-                        matcher.group(2),
-                        matcher.group(4),
-                        matcher.group(6)));
-    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java
index 52d3dabc75..d1e1deb482 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,6 +18,9 @@
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 @RunWith(Java8Runner.class)
 public class ImmutableHashBiMapInverseTest implements ImmutableBiMapTestCase
 {
@@ -30,11 +33,25 @@ public <T> ImmutableBiMap<Object, T> newWith(T... elements)
         MutableBiMap<T, Object> result = new HashBiMap<>();
         for (T each : elements)
         {
-            if (result.put(each, random.nextDouble()) != null)
-            {
-                throw new IllegalStateException();
-            }
+            assertNull(result.put(each, random.nextDouble()));
+        }
+        return result.toImmutable().inverse();
+    }
+
+    @Override
+    public <K, V> ImmutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<V, K> result = new HashBiMap<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((V) elements[i + 1], (K) elements[i]));
         }
         return result.toImmutable().inverse();
     }
+
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapTest.java
index 8f46ce9faa..374da12512 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableHashBiMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,6 +18,9 @@
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 @RunWith(Java8Runner.class)
 public class ImmutableHashBiMapTest implements ImmutableBiMapTestCase
 {
@@ -41,4 +44,20 @@ public <T> ImmutableBiMap<Object, T> newWith(T... elements)
         }
         return result.toImmutable();
     }
+
+    @Override
+    public <K, V> ImmutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<K, V> result = new HashBiMap<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((K) elements[i], (V) elements[i + 1]));
+        }
+        return result.toImmutable();
+    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java
index 2372a52807..dd6f963db4 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -25,12 +25,6 @@ default void Iterable_remove()
         ImmutableUnorderedIterableTestCase.super.Iterable_remove();
     }
 
-    @Override
-    default void Iterable_next()
-    {
-        UnsortedBiMapTestCase.super.Iterable_next();
-    }
-
     @Override
     default void RichIterable_toArray()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapInverseTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapInverseTest.java
index 80af09136e..c42efe9ea2 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapInverseTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapInverseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -17,6 +17,9 @@
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 @RunWith(Java8Runner.class)
 public class HashBiMapInverseTest implements MutableBiMapTestCase
 {
@@ -29,10 +32,23 @@ public <T> MutableBiMap<Object, T> newWith(T... elements)
         MutableBiMap<T, Object> result = new HashBiMap<>();
         for (T each : elements)
         {
-            if (result.put(each, random.nextDouble()) != null)
-            {
-                throw new IllegalStateException();
-            }
+            assertNull(result.put(each, random.nextDouble()));
+        }
+        return result.inverse();
+    }
+
+    @Override
+    public <K, V> MutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<V, K> result = new HashBiMap<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((V) elements[i + 1], (K) elements[i]));
         }
         return result.inverse();
     }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapNoIteratorTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapNoIteratorTest.java
new file mode 100755
index 0000000000..96ef93716e
--- /dev/null
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapNoIteratorTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2022 Goldman Sachs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompany this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.eclipse.collections.test.bimap.mutable;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
+
+import org.eclipse.collections.api.bimap.MutableBiMap;
+import org.eclipse.collections.impl.bimap.mutable.HashBiMap;
+import org.eclipse.collections.impl.test.junit.Java8Runner;
+import org.eclipse.collections.test.NoIteratorTestCase;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+@RunWith(Java8Runner.class)
+public class HashBiMapNoIteratorTest implements MutableBiMapTestCase, NoIteratorTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public <T> MutableBiMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+        MutableBiMap<Object, T> result = new HashBiMapNoIterator<>();
+        for (T each : elements)
+        {
+            try
+            {
+                assertNull(result.put(random.nextDouble(), each));
+            }
+            catch (IllegalArgumentException e)
+            {
+                throw new IllegalStateException(e);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public <K, V> MutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<K, V> result = new HashBiMapNoIterator<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((K) elements[i], (V) elements[i + 1]));
+        }
+        return result;
+    }
+
+    @Override
+    public void Iterable_next()
+    {
+        NoIteratorTestCase.super.Iterable_next();
+    }
+
+    @Override
+    public void Iterable_remove()
+    {
+        NoIteratorTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    public void RichIterable_getFirst()
+    {
+        NoIteratorTestCase.super.RichIterable_getFirst();
+    }
+
+    @Override
+    public void RichIterable_getLast()
+    {
+        NoIteratorTestCase.super.RichIterable_getLast();
+    }
+
+    public static class HashBiMapNoIterator<K, V> extends HashBiMap<K, V>
+    {
+        @Override
+        public Iterator<V> iterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to iterator()");
+        }
+
+        @Override
+        public Set<Entry<K, V>> entrySet()
+        {
+            return new EntrySetNoIterator();
+        }
+
+        @Override
+        public Set<K> keySet()
+        {
+            return new KeySetNoIterator();
+        }
+
+        @Override
+        public Collection<V> values()
+        {
+            return new ValuesCollectionNoIterator();
+        }
+
+        public class EntrySetNoIterator extends EntrySet
+        {
+            @Override
+            public Iterator<Entry<K, V>> iterator()
+            {
+                throw new AssertionError("No iteration patterns should delegate to iterator()");
+            }
+        }
+
+        public class KeySetNoIterator extends KeySet
+        {
+            @Override
+            public Iterator<K> iterator()
+            {
+                throw new AssertionError("No iteration patterns should delegate to iterator()");
+            }
+        }
+
+        public class ValuesCollectionNoIterator extends ValuesCollection
+        {
+            @Override
+            public Iterator<V> iterator()
+            {
+                throw new AssertionError("No iteration patterns should delegate to iterator()");
+            }
+        }
+    }
+}
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapTest.java
index 66efb145c4..cadd338c32 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/HashBiMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -17,6 +17,9 @@
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 @RunWith(Java8Runner.class)
 public class HashBiMapTest implements MutableBiMapTestCase
 {
@@ -31,7 +34,7 @@ public <T> MutableBiMap<Object, T> newWith(T... elements)
         {
             try
             {
-                result.put(random.nextDouble(), each);
+                assertNull(result.put(random.nextDouble(), each));
             }
             catch (IllegalArgumentException e)
             {
@@ -40,4 +43,20 @@ public <T> MutableBiMap<Object, T> newWith(T... elements)
         }
         return result;
     }
+
+    @Override
+    public <K, V> MutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<K, V> result = new HashBiMap<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((K) elements[i], (V) elements[i + 1]));
+        }
+        return result;
+    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java
index aa0b40e5e8..0a57cd0b1f 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -14,21 +14,32 @@
 import org.eclipse.collections.test.MutableUnorderedIterableTestCase;
 import org.eclipse.collections.test.bimap.UnsortedBiMapTestCase;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isOneOf;
+
 public interface MutableUnsortedBiMapTestCase extends UnsortedBiMapTestCase, MutableUnorderedIterableTestCase
 {
     @Override
     <T> MutableBiMap<Object, T> newWith(T... elements);
 
     @Override
-    default void Iterable_remove()
+    <K, V> MutableBiMap<K, V> newWithKeysValues(Object... elements);
+
+    @Override
+    default void Iterable_toString()
     {
-        UnsortedBiMapTestCase.super.Iterable_remove();
+        UnsortedBiMapTestCase.super.Iterable_toString();
+
+        MutableBiMap<String, Integer> bimap = this.newWithKeysValues("Two", 2, "One", 1);
+        assertThat(bimap.keySet().toString(), isOneOf("[One, Two]", "[Two, One]"));
+        assertThat(bimap.values().toString(), isOneOf("[1, 2]", "[2, 1]"));
+        assertThat(bimap.entrySet().toString(), isOneOf("[One=1, Two=2]", "[Two=2, One=1]"));
     }
 
     @Override
-    default void Iterable_next()
+    default void Iterable_remove()
     {
-        UnsortedBiMapTestCase.super.Iterable_next();
+        UnsortedBiMapTestCase.super.Iterable_remove();
     }
 
     @Override
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/UnmodifiableBiMapTest.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/UnmodifiableBiMapTest.java
index 16c4fbbed1..085ca86ceb 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/UnmodifiableBiMapTest.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/bimap/mutable/UnmodifiableBiMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -17,6 +17,9 @@
 import org.eclipse.collections.impl.test.junit.Java8Runner;
 import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 @RunWith(Java8Runner.class)
 public class UnmodifiableBiMapTest implements UnmodifiableBiMapTestCase
 {
@@ -40,4 +43,20 @@ public <T> MutableBiMap<Object, T> newWith(T... elements)
         }
         return result.asUnmodifiable();
     }
+
+    @Override
+    public <K, V> MutableBiMap<K, V> newWithKeysValues(Object... elements)
+    {
+        if (elements.length % 2 != 0)
+        {
+            fail(String.valueOf(elements.length));
+        }
+
+        MutableBiMap<K, V> result = new HashBiMap<>();
+        for (int i = 0; i < elements.length; i += 2)
+        {
+            assertNull(result.put((K) elements[i], (V) elements[i + 1]));
+        }
+        return result.asUnmodifiable();
+    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/ListTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/ListTestCase.java
index 158c3fa6d8..7cc67698b6 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/ListTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/ListTestCase.java
@@ -14,6 +14,7 @@
 import java.util.List;
 
 import org.eclipse.collections.test.CollectionTestCase;
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
@@ -41,6 +42,13 @@ default void Iterable_remove()
         assertEquals(this.newWith(3, 3, 2, 2, 1), list);
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Assert.assertEquals("[3, 3, 3, 2, 2, 1]", iterable.toString());
+    }
+
     @Test
     default void List_get()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/mutable/MutableListTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/mutable/MutableListTestCase.java
index 1f72e3c08c..2427f3196e 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/mutable/MutableListTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/list/mutable/MutableListTestCase.java
@@ -33,6 +33,12 @@ public interface MutableListTestCase extends MutableCollectionTestCase, ListTest
     @Override
     <T> MutableList<T> newWith(T... elements);
 
+    @Override
+    default void Iterable_toString()
+    {
+        ListTestCase.super.Iterable_toString();
+    }
+
     @Override
     default boolean allowsDuplicates()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/MapIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/MapIterableTestCase.java
index 58dbd181bf..bbfaa7bca3 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/MapIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/MapIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -58,6 +58,30 @@ default void serialization()
         assertEquals(copy, original);
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        MapIterable<String, Integer> map = this.newWithKeysValues("Two", 2, "One", 1);
+        Assert.assertEquals("{Two=2, One=1}", map.toString());
+        Assert.assertEquals("[Two, One]", map.keysView().toString());
+        Assert.assertEquals("[2, 1]", map.valuesView().toString());
+        Assert.assertEquals("[Two:2, One:1]", map.keyValuesView().toString());
+        Assert.assertEquals("[2, 1]", map.asLazy().toString());
+
+        Assert.assertEquals(
+                "{10=4, 9=4, 8=4, 7=4, 6=3, 5=3, 4=3, 3=2, 2=2, 1=1}",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).toString());
+        Assert.assertEquals(
+                "[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).keysView().toString());
+        Assert.assertEquals(
+                "[4, 4, 4, 4, 3, 3, 3, 2, 2, 1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).valuesView().toString());
+        Assert.assertEquals(
+                "[10:4, 9:4, 8:4, 7:4, 6:3, 5:3, 4:3, 3:2, 2:2, 1:1]",
+                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).keyValuesView().toString());
+    }
+
     @Test
     default void MapIterable_ifPresentApply()
     {
@@ -165,8 +189,8 @@ default void MapIterable_flipUniqueValues()
         MapIterable<String, Integer> map = this.newWithKeysValues("Three", 3, "Two", 2, "One", 1);
         MapIterable<Integer, String> result = map.flipUniqueValues();
 
-        // TODO: Use IterableTestCase.assertEquals instead, after setting up methods like getExpectedTransformed, but for maps.
-        Assert.assertEquals(
+        // TODO: Set up methods like getExpectedTransformed, but for maps.
+        assertEquals(
                 UnifiedMap.newWithKeysValues(3, "Three", 2, "Two", 1, "One"),
                 result);
 
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/OrderedMapIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/OrderedMapIterableTestCase.java
index 493bfd8c07..0b4de1524b 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/OrderedMapIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/OrderedMapIterableTestCase.java
@@ -17,7 +17,6 @@
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.OrderedIterableTestCase;
 import org.eclipse.collections.test.list.TransformsToListTrait;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
@@ -43,15 +42,6 @@ default <T> MutableList<T> newMutableForFilter(T... elements)
         return Lists.mutable.with(elements);
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        Assert.assertEquals(
-                "{10=4, 9=4, 8=4, 7=4, 6=3, 5=3, 4=3, 3=2, 2=2, 1=1}",
-                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).toString());
-    }
-
     @Test
     default void take()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/SortedMapIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/SortedMapIterableTestCase.java
index 111c420d49..b09951a937 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/SortedMapIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/SortedMapIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -16,8 +16,6 @@
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.OrderedIterableTestCase;
 import org.eclipse.collections.test.list.TransformsToListTrait;
-import org.junit.Assert;
-import org.junit.Test;
 
 public interface SortedMapIterableTestCase extends MapIterableTestCase, OrderedIterableTestCase, TransformsToListTrait
 {
@@ -41,13 +39,4 @@ default <T> MutableList<T> newMutableForFilter(T... elements)
     {
         return Lists.mutable.with(elements);
     }
-
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        Assert.assertEquals(
-                "{10=4, 9=4, 8=4, 7=4, 6=3, 5=3, 4=3, 3=2, 2=2, 1=1}",
-                this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1).toString());
-    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/UnsortedMapIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/UnsortedMapIterableTestCase.java
index 950be35e65..315c5c8d5b 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/UnsortedMapIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/UnsortedMapIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -10,26 +10,24 @@
 
 package org.eclipse.collections.test.map;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.bag.MutableBag;
 import org.eclipse.collections.api.bag.UnsortedBag;
 import org.eclipse.collections.api.list.MutableList;
+import org.eclipse.collections.api.map.MapIterable;
 import org.eclipse.collections.api.map.UnsortedMapIterable;
 import org.eclipse.collections.impl.factory.Bags;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.test.UnorderedIterableTestCase;
 import org.eclipse.collections.test.bag.TransformsToBagTrait;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isOneOf;
-import static org.junit.Assert.assertThat;
 
-public interface UnsortedMapIterableTestCase extends MapIterableTestCase, UnorderedIterableTestCase, TransformsToBagTrait
+public interface UnsortedMapIterableTestCase
+        extends MapIterableTestCase, UnorderedIterableTestCase, TransformsToBagTrait
 {
     @Override
     <T> UnsortedMapIterable<Object, T> newWith(T... elements);
@@ -46,6 +44,18 @@ default <T> MutableBag<T> newMutableForFilter(T... elements)
         return Bags.mutable.with(elements);
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        MapIterable<String, Integer> map = this.newWithKeysValues("Two", 2, "One", 1);
+
+        assertThat(map.toString(), isOneOf("{One=1, Two=2}", "{Two=2, One=1}"));
+        assertThat(map.keysView().toString(), isOneOf("[One, Two]", "[Two, One]"));
+        assertThat(map.valuesView().toString(), isOneOf("[1, 2]", "[2, 1]"));
+        assertThat(map.keyValuesView().toString(), isOneOf("[One:1, Two:2]", "[Two:2, One:1]"));
+        assertThat(map.asLazy().toString(), isOneOf("[1, 2]", "[2, 1]"));
+    }
+
     @Override
     @Test
     default void RichIterable_makeString_appendString()
@@ -68,25 +78,6 @@ default void RichIterable_makeString_appendString()
         assertThat(builder3.toString(), isOneOf("[2/2/1]", "[1/2/2]", "[2/1/2]"));
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        String string = this.newWith(2, 2, 1).toString();
-        Pattern pattern = Pattern.compile("^\\{\\d\\.\\d+(E-\\d)?=(\\d),"
-                + " \\d\\.\\d+(E-\\d)?=(\\d),"
-                + " \\d\\.\\d+(E-\\d)?=(\\d)\\}$");
-        Matcher matcher = pattern.matcher(string);
-        Assert.assertTrue(string, matcher.matches());
-
-        assertEquals(
-                Bags.immutable.with("1", "2", "2"),
-                Bags.immutable.with(
-                        matcher.group(2),
-                        matcher.group(4),
-                        matcher.group(6)));
-    }
-
     @Override
     @Test
     default void RichIterable_toList()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapIterableTestCase.java
index 493c5b58e5..2528bb708a 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapIterableTestCase.java
@@ -23,6 +23,7 @@
 import org.eclipse.collections.impl.tuple.ImmutableEntry;
 import org.eclipse.collections.test.CollisionsTestCase;
 import org.eclipse.collections.test.map.MapIterableTestCase;
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.eclipse.collections.impl.test.Verify.assertIterablesEqual;
@@ -39,6 +40,17 @@ public interface MutableMapIterableTestCase extends MapIterableTestCase
     @Override
     <K, V> MutableMapIterable<K, V> newWithKeysValues(Object... elements);
 
+    @Override
+    default void Iterable_toString()
+    {
+        MapIterableTestCase.super.Iterable_toString();
+
+        MutableMapIterable<String, Integer> map = this.newWithKeysValues("Two", 2, "One", 1);
+        Assert.assertEquals("[Two, One]", map.keySet().toString());
+        Assert.assertEquals("[2, 1]", map.values().toString());
+        Assert.assertEquals("[Two=2, One=1]", map.entrySet().toString());
+    }
+
     @Test
     default void Map_clear()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapTestCase.java
index 2462f366c9..c5321b6274 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/map/mutable/MutableMapTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -18,14 +18,28 @@
 import org.eclipse.collections.test.map.UnsortedMapIterableTestCase;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isOneOf;
-import static org.junit.Assert.assertThat;
 
 public interface MutableMapTestCase extends UnsortedMapIterableTestCase, MutableUnorderedIterableTestCase, MutableMapIterableTestCase
 {
     @Override
     <T> MutableMap<Object, T> newWith(T... elements);
 
+    @Override
+    <K, V> MutableMap<K, V> newWithKeysValues(Object... elements);
+
+    @Override
+    default void Iterable_toString()
+    {
+        UnsortedMapIterableTestCase.super.Iterable_toString();
+
+        MutableMap<String, Integer> map = this.newWithKeysValues("Two", 2, "One", 1);
+        assertThat(map.keySet().toString(), isOneOf("[One, Two]", "[Two, One]"));
+        assertThat(map.values().toString(), isOneOf("[1, 2]", "[2, 1]"));
+        assertThat(map.entrySet().toString(), isOneOf("[One=1, Two=2]", "[Two=2, One=1]"));
+    }
+
     @Override
     default void Iterable_remove()
     {
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/SetTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/SetTestCase.java
index e1d2f537d8..f1f77679d8 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/SetTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/SetTestCase.java
@@ -23,11 +23,11 @@
 
 import static org.eclipse.collections.impl.test.Verify.assertPostSerializedEqualsAndHashCode;
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.isOneOf;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public interface SetTestCase extends CollectionTestCase
@@ -66,6 +66,12 @@ default void Object_equalsAndHashCode()
         assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 2, 1));
     }
 
+    @Test
+    default void Iterable_toString()
+    {
+        assertThat(this.newWith(2, 1).toString(), isOneOf("[1, 2]", "[2, 1]"));
+    }
+
     @Override
     @Test
     default void Iterable_next()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetIterableTestCase.java
index c219077ccc..5d15603bce 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetIterableTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -10,15 +10,11 @@
 
 package org.eclipse.collections.test.set;
 
-import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.set.UnsortedSetIterable;
 import org.eclipse.collections.impl.factory.Sets;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.isOneOf;
-import static org.junit.Assert.assertThat;
-
 public interface UnsortedSetIterableTestCase extends SetIterableTestCase, TransformsToUnsortedSetTrait, UnsortedSetLikeTestTrait
 {
     @Override
@@ -36,20 +32,6 @@ default <T> MutableSet<T> newMutableForTransform(T... elements)
         return Sets.mutable.with(elements);
     }
 
-    @Override
-    @Test
-    default void RichIterable_toString()
-    {
-        RichIterable<Integer> iterable = this.newWith(3, 2, 1);
-        assertThat(iterable.toString(), isOneOf(
-                "[3, 2, 1]",
-                "[3, 1, 2]",
-                "[2, 3, 1]",
-                "[2, 1, 3]",
-                "[1, 3, 2]",
-                "[1, 2, 3]"));
-    }
-
     @Override
     @Test
     default void RichIterable_toArray()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetLikeTestTrait.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetLikeTestTrait.java
index c9542fa3a3..0821295b62 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetLikeTestTrait.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/UnsortedSetLikeTestTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -24,11 +24,11 @@
 import org.junit.Test;
 
 import static org.eclipse.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isOneOf;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 
 public interface UnsortedSetLikeTestTrait extends RichIterableUniqueTestCase, UnorderedIterableTestCase
 {
@@ -44,6 +44,13 @@ default <T> MutableSet<T> newMutableForFilter(T... elements)
         return Sets.mutable.with(elements);
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        assertThat(this.newWith(2, 1).toString(), isOneOf("[1, 2]", "[2, 1]"));
+        assertThat(this.newWith(2, 1).asLazy().toString(), isOneOf("[1, 2]", "[2, 1]"));
+    }
+
     @Override
     @Test
     default void Iterable_next()
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/mutable/MutableSetTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/mutable/MutableSetTestCase.java
index 629f8714e4..ab7709c109 100644
--- a/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/mutable/MutableSetTestCase.java
+++ b/unit-tests-java8/src/test/java/org/eclipse/collections/test/set/mutable/MutableSetTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -41,6 +41,12 @@ default void Object_equalsAndHashCode()
         UnsortedSetIterableTestCase.super.Object_equalsAndHashCode();
     }
 
+    @Override
+    default void Iterable_toString()
+    {
+        SetTestCase.super.Iterable_toString();
+    }
+
     @Override
     default void Iterable_next()
     {