diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index c8f4266c5..70b60ac4f 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -5,7 +5,7 @@
       <value>
         <option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
         <option name="IMPORT_LAYOUT_TABLE">
           <value>
             <package name="java" withSubpackages="true" static="false" />
@@ -169,4 +169,4 @@
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 1e26e49e3..2acf6a888 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -12,11 +12,12 @@
     <file url="file://$PROJECT_DIR$/gs-collections-forkjoin" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jmh-scala-tests" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jmh-tests" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/junit-trait-runner" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/memory-tests" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/performance-tests" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/scala-unit-tests" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/serialization-tests" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/unit-tests" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/unit-tests-java8" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
index 0e1d98c9a..58455ec7f 100644
--- a/.idea/inspectionProfiles/IDE.xml
+++ b/.idea/inspectionProfiles/IDE.xml
@@ -212,6 +212,7 @@
       <option name="CHECK_METHOD_BODY" value="true" />
     </inspection_tool>
     <inspection_tool class="DefaultNotLastCaseInSwitch" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Dependency" enabled="true" level="INSPECTION" enabled_by_default="true" />
     <inspection_tool class="DeprecatedClassUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Deprecation" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="DisjointPackage" enabled="true" level="WARNING" enabled_by_default="false" />
@@ -1365,7 +1366,15 @@
     </inspection_tool>
     <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="INSPECTION" enabled_by_default="true" />
     <inspection_tool class="StaticGuardedByInstance" enabled="true" level="INSPECTION" enabled_by_default="true" />
-    <inspection_tool class="StaticImport" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StaticImport" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="allowedClasses">
+        <set>
+          <option value="com.gs.collections.impl.test.Verify" />
+          <option value="org.hamcrest.Matchers" />
+          <option value="org.junit.Assert" />
+        </set>
+      </option>
+    </inspection_tool>
     <inspection_tool class="StaticInheritance" enabled="true" level="INSPECTION" enabled_by_default="true" />
     <inspection_tool class="StaticMethodNamingConvention" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_regex" value="[a-z][A-Za-z\d]*" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8d09f99c5..16f1fe255 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,14 +43,13 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/acceptance-tests/pom.xml" />
       </list>
     </option>
   </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
   <component name="SvnBranchConfigurationManager">
@@ -68,4 +67,3 @@
     <option name="mySupportsUserInfoFilter" value="true" />
   </component>
 </project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b9d00117d..3bfc108ff 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -13,12 +13,13 @@
       <module fileurl="file://$PROJECT_DIR$/collections-testutils/gs-collections-testutils.iml" filepath="$PROJECT_DIR$/collections-testutils/gs-collections-testutils.iml" />
       <module fileurl="file://$PROJECT_DIR$/jmh-scala-tests/jmh-scala-tests.iml" filepath="$PROJECT_DIR$/jmh-scala-tests/jmh-scala-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/jmh-tests/jmh-tests.iml" filepath="$PROJECT_DIR$/jmh-tests/jmh-tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/junit-trait-runner/junit-trait-runner.iml" filepath="$PROJECT_DIR$/junit-trait-runner/junit-trait-runner.iml" />
       <module fileurl="file://$PROJECT_DIR$/memory-tests/memory-tests.iml" filepath="$PROJECT_DIR$/memory-tests/memory-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/performance-tests/performance-tests.iml" filepath="$PROJECT_DIR$/performance-tests/performance-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/scala-unit-tests/scala-unit-tests.iml" filepath="$PROJECT_DIR$/scala-unit-tests/scala-unit-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/serialization-tests/serialization-tests.iml" filepath="$PROJECT_DIR$/serialization-tests/serialization-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/unit-tests/unit-tests.iml" filepath="$PROJECT_DIR$/unit-tests/unit-tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/unit-tests-java8/unit-tests-java8.iml" filepath="$PROJECT_DIR$/unit-tests-java8/unit-tests-java8.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index 7ac64849f..7606fd64f 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -93,6 +93,11 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/checkstyle-configuration.xml b/checkstyle-configuration.xml
index 13b82bbe0..6422aaa66 100644
--- a/checkstyle-configuration.xml
+++ b/checkstyle-configuration.xml
@@ -4,7 +4,7 @@
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -228,7 +228,7 @@
 
         <module name="AvoidStaticImport">
             <property name="excludes"
-                value="org.junit.Assert.*,org.hamcrest.CoreMatchers.*,com.gs.collections.impl.test.Verify.*,com.gs.collections.impl.factory.Iterables.*" />
+                value="org.junit.Assert.*,org.hamcrest.CoreMatchers.*,org.hamcrest.Matchers.*,com.gs.collections.impl.test.Verify.*,com.gs.collections.impl.factory.Iterables.*,com.gs.collections.test.IterableTestCase.*" />
         </module>
 
         <module name="MissingDeprecated" />
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 1b8825320..eaab54b53 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -4,7 +4,7 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -56,6 +56,9 @@
     <suppress checks="ConstantName" files="Multimaps.java" />
 
     <suppress checks="MethodName" files="GsCollectionsCodeGenerator.java" />
+    <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
+
+    <suppress checks="MethodName" files="[\\/]unit-tests-java8[\\/]" />
 
     <suppress checks="IllegalImport" files="ConcurrentHashMapUnsafe.java" />
 
diff --git a/collections-testutils/gs-collections-testutils.iml b/collections-testutils/gs-collections-testutils.iml
index 450383cc0..31d2cf3fe 100644
--- a/collections-testutils/gs-collections-testutils.iml
+++ b/collections-testutils/gs-collections-testutils.iml
@@ -14,8 +14,7 @@
     <orderEntry type="module" module-name="gs-collections-api" />
     <orderEntry type="module" module-name="gs-collections" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/collections-testutils/pom.xml b/collections-testutils/pom.xml
index fdf2665bf..e1f3d3f85 100644
--- a/collections-testutils/pom.xml
+++ b/collections-testutils/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/collections-testutils/src/main/java/com/gs/collections/impl/test/Verify.java b/collections-testutils/src/main/java/com/gs/collections/impl/test/Verify.java
index 7c7e75317..91a3b3d53 100644
--- a/collections-testutils/src/main/java/com/gs/collections/impl/test/Verify.java
+++ b/collections-testutils/src/main/java/com/gs/collections/impl/test/Verify.java
@@ -34,6 +34,7 @@
 import java.util.SortedSet;
 import java.util.concurrent.Callable;
 
+import com.gs.collections.api.InternalIterable;
 import com.gs.collections.api.PrimitiveIterable;
 import com.gs.collections.api.bag.sorted.SortedBag;
 import com.gs.collections.api.block.predicate.Predicate;
@@ -50,8 +51,10 @@
 import com.gs.collections.api.set.MutableSet;
 import com.gs.collections.impl.block.factory.Comparators;
 import com.gs.collections.impl.block.factory.Predicates;
+import com.gs.collections.impl.block.procedure.CollectionAddProcedure;
 import com.gs.collections.impl.factory.Lists;
 import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.impl.list.mutable.FastList;
 import com.gs.collections.impl.map.mutable.UnifiedMap;
 import com.gs.collections.impl.set.mutable.UnifiedSet;
 import com.gs.collections.impl.tuple.ImmutableEntry;
@@ -1877,7 +1880,22 @@ public static void assertListsEqual(String listName, List<?> expectedList, List<
     {
         try
         {
-            Verify.assertIterablesEqual(listName, expectedList, actualList);
+            if (expectedList == null && actualList == null)
+            {
+                return;
+            }
+            Assert.assertNotNull(expectedList);
+            Assert.assertNotNull(actualList);
+            Assert.assertEquals(listName + " size", expectedList.size(), actualList.size());
+            for (int index = 0; index < actualList.size(); index++)
+            {
+                Object eachExpected = expectedList.get(index);
+                Object eachActual = actualList.get(index);
+                if (!Comparators.nullSafeEquals(eachExpected, eachActual))
+                {
+                    junit.framework.Assert.failNotEquals(listName + " first differed at element [" + index + "];", eachExpected, eachActual);
+                }
+            }
         }
         catch (AssertionError e)
         {
@@ -1952,6 +1970,7 @@ public static void assertSortedSetsEqual(String setName, SortedSet<?> expectedSe
     {
         try
         {
+            Assert.assertEquals(setName, expectedSet, actualSet);
             Verify.assertIterablesEqual(setName, expectedSet, actualSet);
         }
         catch (AssertionError e)
@@ -1976,6 +1995,7 @@ public static void assertSortedBagsEqual(String bagName, SortedBag<?> expectedBa
     {
         try
         {
+            Assert.assertEquals(bagName, expectedBag, actualBag);
             Verify.assertIterablesEqual(bagName, expectedBag, actualBag);
         }
         catch (AssertionError e)
@@ -2000,6 +2020,7 @@ public static void assertSortedMapsEqual(String mapName, SortedMapIterable<?, ?>
     {
         try
         {
+            Assert.assertEquals(mapName, expectedMap, actualMap);
             Verify.assertIterablesEqual(mapName, expectedMap, actualMap);
         }
         catch (AssertionError e)
@@ -2032,33 +2053,40 @@ public static void assertIterablesEqual(String iterableName, Iterable<?> expecte
 
             Verify.assertObjectNotNull(iterableName, actualIterable);
 
-            if (expectedIterable.equals(actualIterable))
+            if (expectedIterable instanceof InternalIterable<?> && actualIterable instanceof InternalIterable<?>)
             {
-                return;
+                MutableList<Object> expectedList = FastList.newList();
+                MutableList<Object> actualList = FastList.newList();
+                ((InternalIterable<?>) expectedIterable).forEach(CollectionAddProcedure.on(expectedList));
+                ((InternalIterable<?>) actualIterable).forEach(CollectionAddProcedure.on(actualList));
+                Verify.assertListsEqual(iterableName, expectedList, actualList);
             }
-            Iterator<?> expectedIterator = expectedIterable.iterator();
-            Iterator<?> actualIterator = actualIterable.iterator();
-            int index = 0;
-
-            while (expectedIterator.hasNext() && actualIterator.hasNext())
+            else
             {
-                Object eachExpected = expectedIterator.next();
-                Object eachActual = actualIterator.next();
+                Iterator<?> expectedIterator = expectedIterable.iterator();
+                Iterator<?> actualIterator = actualIterable.iterator();
+                int index = 0;
 
-                if (!Comparators.nullSafeEquals(eachExpected, eachActual))
+                while (expectedIterator.hasNext() && actualIterator.hasNext())
                 {
-                    //noinspection UseOfObsoleteAssert
-                    junit.framework.Assert.failNotEquals(iterableName + " first differed at element [" + index + "];", eachExpected, eachActual);
+                    Object eachExpected = expectedIterator.next();
+                    Object eachActual = actualIterator.next();
+
+                    if (!Comparators.nullSafeEquals(eachExpected, eachActual))
+                    {
+                        //noinspection UseOfObsoleteAssert
+                        junit.framework.Assert.failNotEquals(iterableName + " first differed at element [" + index + "];", eachExpected, eachActual);
+                    }
+                    index++;
                 }
-                index++;
-            }
 
-            Assert.assertFalse("Actual " + iterableName + " had " + index + " elements but expected " + iterableName + " had more.", expectedIterator.hasNext());
-            Assert.assertFalse("Expected " + iterableName + " had " + index + " elements but actual " + iterableName + " had more.", actualIterator.hasNext());
+                Assert.assertFalse("Actual " + iterableName + " had " + index + " elements but expected " + iterableName + " had more.", expectedIterator.hasNext());
+                Assert.assertFalse("Expected " + iterableName + " had " + index + " elements but actual " + iterableName + " had more.", actualIterator.hasNext());
+            }
         }
         catch (AssertionError e)
         {
-            throwMangledException(e);
+            Verify.throwMangledException(e);
         }
     }
 
@@ -3214,7 +3242,7 @@ public static void assertSerializedForm(String expectedBase64Form, Object actual
             Assert.assertEquals(
                     "Serialization was broken.",
                     expectedBase64Form,
-                    encodeObject(actualObject));
+                    Verify.encodeObject(actualObject));
         }
         catch (AssertionError e)
         {
diff --git a/gs-collections-forkjoin/pom.xml b/gs-collections-forkjoin/pom.xml
index afddcae8e..89eff73ca 100644
--- a/gs-collections-forkjoin/pom.xml
+++ b/gs-collections-forkjoin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/jmh-scala-tests/pom.xml b/jmh-scala-tests/pom.xml
index f2ef4ff6f..dc227de74 100644
--- a/jmh-scala-tests/pom.xml
+++ b/jmh-scala-tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/jmh-tests/pom.xml b/jmh-tests/pom.xml
index 38761b34e..4301f78d2 100644
--- a/jmh-tests/pom.xml
+++ b/jmh-tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>compile</scope>
         </dependency>
 
@@ -110,6 +110,11 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/junit-trait-runner/junit-trait-runner.iml b/junit-trait-runner/junit-trait-runner.iml
new file mode 100644
index 000000000..9e9cd9698
--- /dev/null
+++ b/junit-trait-runner/junit-trait-runner.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/junit-trait-runner/pom.xml b/junit-trait-runner/pom.xml
new file mode 100644
index 000000000..23715a966
--- /dev/null
+++ b/junit-trait-runner/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015 Goldman Sachs.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections-parent</artifactId>
+        <version>5.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>junit-trait-runner</artifactId>
+
+    <name>Goldman Sachs Test Trait JUnit Runner</name>
+
+    <prerequisites>
+        <maven>3.0.5</maven>
+    </prerequisites>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce</id>
+                        <configuration>
+                            <rules>
+                                <!-- <DependencyConvergence /> -->
+                                <requirePluginVersions>
+                                    <unCheckedPluginList>com.goldmansachs:gs-collections-code-generator-maven-plugin
+                                    </unCheckedPluginList>
+                                </requirePluginVersions>
+                                <requireJavaVersion>
+                                    <version>1.8.0</version>
+                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>3.0.2</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/junit-trait-runner/src/main/java/com/gs/junit/runners/Java8Runner.java b/junit-trait-runner/src/main/java/com/gs/junit/runners/Java8Runner.java
new file mode 100644
index 000000000..3025b3a94
--- /dev/null
+++ b/junit-trait-runner/src/main/java/com/gs/junit/runners/Java8Runner.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.junit.runners;
+
+import com.gs.junit.runners.model.Java8TestClass;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+
+public class Java8Runner extends BlockJUnit4ClassRunner
+{
+    /**
+     * Creates a Java8Runner to run {@code klass}
+     *
+     * @throws InitializationError if the test class is malformed.
+     */
+    public Java8Runner(Class<?> klass) throws InitializationError
+    {
+        super(klass);
+    }
+
+    @Override
+    protected Java8TestClass createTestClass(Class<?> testClass)
+    {
+        return new Java8TestClass(testClass);
+    }
+}
diff --git a/junit-trait-runner/src/main/java/com/gs/junit/runners/model/Java8TestClass.java b/junit-trait-runner/src/main/java/com/gs/junit/runners/model/Java8TestClass.java
new file mode 100644
index 000000000..08170d1c9
--- /dev/null
+++ b/junit-trait-runner/src/main/java/com/gs/junit/runners/model/Java8TestClass.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.junit.runners.model;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.internal.MethodSorter;
+import org.junit.runners.model.FrameworkField;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.TestClass;
+
+public class Java8TestClass extends TestClass
+{
+    /**
+     * Creates a {@code TestClass} wrapping {@code klass}. Each time this
+     * constructor executes, the class is scanned for annotations, which can be
+     * an expensive process (we hope in future JDK's it will not be.) Therefore,
+     * try to share instances of {@code TestClass} where possible.
+     */
+    public Java8TestClass(Class<?> klass)
+    {
+        super(klass);
+    }
+
+    @Override
+    protected void scanAnnotatedMembers(Map<Class<? extends Annotation>, List<FrameworkMethod>> methodsForAnnotations, Map<Class<? extends Annotation>, List<FrameworkField>> fieldsForAnnotations)
+    {
+        super.scanAnnotatedMembers(methodsForAnnotations, fieldsForAnnotations);
+
+        this.getInterfaceMethodsForAnnotations(methodsForAnnotations, this.getJavaClass());
+    }
+
+    private void getInterfaceMethodsForAnnotations(Map<Class<? extends Annotation>, List<FrameworkMethod>> methodsForAnnotations, Class<?> clazz)
+    {
+        List<Class<?>> interfaces = Java8TestClass.getInterfaces(this.getJavaClass());
+        for (Class<?> eachInterface : interfaces)
+        {
+            for (Method eachMethod : MethodSorter.getDeclaredMethods(eachInterface))
+            {
+                if (!Modifier.isAbstract(eachMethod.getModifiers()))
+                {
+                    TestClass.addToAnnotationLists(new FrameworkMethod(eachMethod), methodsForAnnotations);
+                }
+            }
+        }
+    }
+
+    private static List<Class<?>> getInterfaces(Class<?> testClass)
+    {
+        LinkedList<Class<?>> queue = new LinkedList<Class<?>>();
+        queue.add(testClass);
+
+        Set<Class<?>> visited = new HashSet<Class<?>>();
+        visited.add(testClass);
+
+        List<Class<?>> results = new ArrayList<Class<?>>();
+        while (!queue.isEmpty())
+        {
+            Class<?> anInterface = queue.poll();
+            results.add(anInterface);
+
+            Class<?>[] parentInterfaces = anInterface.getInterfaces();
+            for (Class<?> parentInterface : parentInterfaces)
+            {
+                if (!visited.contains(parentInterface))
+                {
+                    visited.add(parentInterface);
+                    queue.add(parentInterface);
+                }
+            }
+        }
+        return results;
+    }
+}
diff --git a/memory-tests/pom.xml b/memory-tests/pom.xml
index c14010c82..210d097ad 100644
--- a/memory-tests/pom.xml
+++ b/memory-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -106,6 +106,11 @@
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index a0c56d893..58da50fc7 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -114,6 +114,11 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/pom.xml b/pom.xml
index bba99a524..acd8173a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -83,6 +83,8 @@
         <module>serialization-tests</module>
         <module>jmh-scala-tests</module>
         <module>jmh-tests</module>
+        <module>junit-trait-runner</module>
+        <module>unit-tests-java8</module>
     </modules>
 
     <properties>
@@ -105,7 +107,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>4.12</version>
                 <scope>test</scope>
             </dependency>
 
@@ -165,6 +167,13 @@
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.5.1</version>
+                    <configuration>
+                        <fork>true</fork>
+                        <compilerArguments>
+                            <J-Xmx2048m />
+                        </compilerArguments>
+                        <verbose>true</verbose>
+                    </configuration>
                 </plugin>
 
                 <plugin>
diff --git a/scala-unit-tests/.classpath b/scala-unit-tests/.classpath
index f24dff348..0ece05bf0 100644
--- a/scala-unit-tests/.classpath
+++ b/scala-unit-tests/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry kind="src" path="src/test/scala"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/collections"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/collections-testutils"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: junit:junit:4.11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: junit:junit:4.12"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.scala-lang:scala-library:2.11.0"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/serialization-tests/pom.xml b/serialization-tests/pom.xml
index a86855207..719d63261 100644
--- a/serialization-tests/pom.xml
+++ b/serialization-tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -82,6 +82,11 @@
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/serialization-tests/serialization-tests.iml b/serialization-tests/serialization-tests.iml
index 70123649b..9a6557cc8 100644
--- a/serialization-tests/serialization-tests.iml
+++ b/serialization-tests/serialization-tests.iml
@@ -13,9 +13,8 @@
     <orderEntry type="module" module-name="gs-collections" scope="TEST" />
     <orderEntry type="module" module-name="gs-collections-testutils" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/unit-tests-java8/pom.xml b/unit-tests-java8/pom.xml
new file mode 100644
index 000000000..1c04b6ed0
--- /dev/null
+++ b/unit-tests-java8/pom.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2015 Goldman Sachs.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.goldmansachs</groupId>
+        <artifactId>gs-collections-parent</artifactId>
+        <version>5.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>unit-tests-java8</artifactId>
+
+    <name>Goldman Sachs Collections Java 8 Unit Test Suite</name>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <prerequisites>
+        <maven>3.0.5</maven>
+    </prerequisites>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.goldmansachs</groupId>
+            <artifactId>gs-collections-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.goldmansachs</groupId>
+            <artifactId>gs-collections</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.goldmansachs</groupId>
+            <artifactId>gs-collections-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.goldmansachs</groupId>
+            <artifactId>junit-trait-runner</artifactId>
+            <version>5.2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>com.atlassian.maven.plugins</groupId>
+                <artifactId>maven-clover2-plugin</artifactId>
+                <version>${clover.version}</version>
+                <configuration>
+                    <licenseLocation>${clover.license}</licenseLocation>
+                    <contextFilters>@deprecated</contextFilters>
+                    <generateHistorical>true</generateHistorical>
+                    <historyDir>${user.home}/clover/${project.artifactId}</historyDir>
+                    <excludes>
+                        <exclude>**/FileUtils.java</exclude>
+                        <exclude>**/GenerateMojo.java</exclude>
+                        <exclude>**/GsCollectionsCodeGenerator.java</exclude>
+                        <exclude>**/GsCollectionsCodeGeneratorTask.java</exclude>
+                        <exclude>**/Primitive.java</exclude>
+                        <exclude>**/IntegerOrStringRenderer.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce</id>
+                        <configuration>
+                            <rules>
+                                <!-- <DependencyConvergence /> -->
+                                <requirePluginVersions>
+                                    <unCheckedPluginList>com.goldmansachs:gs-collections-code-generator-maven-plugin
+                                    </unCheckedPluginList>
+                                </requirePluginVersions>
+                                <requireJavaVersion>
+                                    <version>1.8.0</version>
+                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>3.0.2</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>clover</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.atlassian.maven.plugins</groupId>
+                        <artifactId>maven-clover2-plugin</artifactId>
+                        <version>${clover.version}</version>
+                        <configuration>
+                            <licenseLocation>${clover.license}</licenseLocation>
+                            <contextFilters>@deprecated</contextFilters>
+                            <generateHistorical>true</generateHistorical>
+                            <historyDir>${user.home}/clover/${project.artifactId}</historyDir>
+                            <includesAllSourceRoots>true</includesAllSourceRoots>
+                            <instrumentLambda>block</instrumentLambda>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setup</id>
+                                <phase>process-test-sources</phase>
+                                <goals>
+                                    <goal>setup</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/CollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/CollectionTestCase.java
new file mode 100644
index 000000000..740f6cdee
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/CollectionTestCase.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Collection;
+
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public interface CollectionTestCase extends IterableTestCase
+{
+    @Override
+    <T> Collection<T> newWith(T... elements);
+
+    @Test
+    default void Collection_size()
+    {
+        if (this.allowsDuplicates())
+        {
+            Collection<Integer> collection = this.newWith(3, 3, 3, 2, 2, 1);
+            assertThat(collection, hasSize(6));
+        }
+        else
+        {
+            Collection<Integer> collection = this.newWith(3, 2, 1);
+            assertThat(collection, hasSize(3));
+        }
+        assertThat(this.newWith(), hasSize(0));
+    }
+
+    @Test
+    default void Collection_contains()
+    {
+        Collection<Integer> collection = this.newWith(3, 2, 1);
+        assertTrue(collection.contains(1));
+        assertTrue(collection.contains(2));
+        assertTrue(collection.contains(3));
+        assertFalse(collection.contains(4));
+    }
+
+    @Test
+    default void Collection_add()
+    {
+        Collection<Integer> collection = this.newWith(3, 2, 1);
+        assertTrue(collection.add(4));
+        assertEquals(this.allowsDuplicates(), collection.add(4));
+    }
+
+    @Test
+    default void Collection_clear()
+    {
+        Collection<Integer> collection = this.newWith(1, 2, 3);
+        assertThat(collection, is(not(empty())));
+        collection.clear();
+        assertThat(collection, is(empty()));
+        assertThat(collection, hasSize(0));
+        collection.clear();
+        assertThat(collection, is(empty()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/ImmutableUnorderedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/ImmutableUnorderedIterableTestCase.java
new file mode 100644
index 000000000..f8a44454b
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/ImmutableUnorderedIterableTestCase.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import com.gs.collections.impl.test.Verify;
+import org.junit.Test;
+
+public interface ImmutableUnorderedIterableTestCase extends UnorderedIterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        Iterator<Integer> iterator = this.newWith(3, 2, 1).iterator();
+        iterator.next();
+        Verify.assertThrows(UnsupportedOperationException.class, iterator::remove);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/IterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/IterableTestCase.java
new file mode 100644
index 000000000..008919920
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/IterableTestCase.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.SortedMap;
+import java.util.SortedSet;
+
+import com.gs.collections.api.collection.ImmutableCollection;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.ordered.ReversibleIterable;
+import com.gs.collections.api.ordered.SortedIterable;
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.impl.list.mutable.MultiReaderFastList;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertIterablesEqual;
+import static com.gs.collections.impl.test.Verify.assertPostSerializedEqualsAndHashCode;
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+public interface IterableTestCase
+{
+    static void assertEquals(Object o1, Object o2)
+    {
+        Assert.assertEquals(o1, o2);
+        IterableTestCase.checkNotSame(o1, o2);
+
+        if (o1 instanceof MultiReaderFastList<?> || o2 instanceof MultiReaderFastList<?>)
+        {
+            return;
+        }
+        if (o1 instanceof SortedIterable<?> || o2 instanceof SortedIterable<?>
+                || o1 instanceof ReversibleIterable<?> || o2 instanceof ReversibleIterable<?>
+                || o1 instanceof List<?> || o2 instanceof List<?>
+                || o1 instanceof SortedSet<?> || o2 instanceof SortedSet<?>)
+        {
+            assertIterablesEqual((Iterable<?>) o1, (Iterable<?>) o2);
+            if (o1 instanceof SortedIterable<?> || o2 instanceof SortedIterable<?>)
+            {
+                assertSame(((SortedIterable<?>) o1).comparator(), ((SortedIterable<?>) o2).comparator());
+            }
+        }
+        else if (o1 instanceof SortedMap<?, ?> || o2 instanceof SortedMap<?, ?>)
+        {
+            IterableTestCase.assertEquals(((SortedMap<?, ?>) o1).keySet(), ((SortedMap<?, ?>) o2).keySet());
+        }
+    }
+
+    static void checkNotSame(Object o1, Object o2)
+    {
+        if (o1 instanceof String && o2 instanceof String)
+        {
+            return;
+        }
+        if ((o1 instanceof Number && o2 instanceof Number)
+                || (o1 instanceof Boolean && o2 instanceof Boolean)
+                || o1 instanceof ImmutableCollection<?> && o2 instanceof ImmutableCollection<?>
+                && ((ImmutableCollection<?>) o1).isEmpty() && ((ImmutableCollection<?>) o2).isEmpty())
+        {
+            assertSame(o1, o2);
+            return;
+        }
+        assertNotSame(o1, o2);
+    }
+
+    static <T> void addAllTo(T[] elements, MutableCollection<T> result)
+    {
+        for (T element : elements)
+        {
+            if (!result.add(element))
+            {
+                throw new IllegalStateException();
+            }
+        }
+    }
+
+    <T> Iterable<T> newWith(T... elements);
+
+    boolean allowsDuplicates();
+
+    @Test
+    default void Object_equalsAndHashCode()
+    {
+        assertPostSerializedEqualsAndHashCode(this.newWith(3, 3, 3, 2, 2, 1));
+
+        assertNotEquals(this.newWith(4, 3, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 3, 2, 1));
+
+        assertNotEquals(this.newWith(2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(2, 1));
+
+        assertNotEquals(this.newWith(3, 3, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(3, 3, 2, 1));
+
+        assertNotEquals(this.newWith(3, 3, 2, 1), this.newWith(3, 2, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 2, 1), this.newWith(3, 3, 2, 1));
+    }
+
+    @Test
+    default void Iterable_hasNext()
+    {
+        assertTrue(this.newWith(3, 2, 1).iterator().hasNext());
+        assertFalse(this.newWith().iterator().hasNext());
+    }
+
+    @Test
+    default void Iterable_next()
+    {
+        Iterator<Integer> iterator = this.newWith(3, 2, 1).iterator();
+        MutableSet<Integer> set = Sets.mutable.with();
+        assertTrue(set.add(iterator.next()));
+        assertTrue(set.add(iterator.next()));
+        assertTrue(set.add(iterator.next()));
+        IterableTestCase.assertEquals(Sets.immutable.with(3, 2, 1), set);
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    default void Iterable_next_throws_on_empty()
+    {
+        this.newWith().iterator().next();
+    }
+
+    @Test
+    default void Iterable_next_throws_at_end()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        assertTrue(iterator.hasNext());
+        iterator.next();
+        assertTrue(iterator.hasNext());
+        iterator.next();
+        assertTrue(iterator.hasNext());
+        iterator.next();
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, (Runnable) iterator::next);
+
+        Iterator<Integer> iterator2 = iterable.iterator();
+        iterator2.next();
+        iterator2.next();
+        iterator2.next();
+        assertThrows(NoSuchElementException.class, (Runnable) iterator2::next);
+        assertThrows(NoSuchElementException.class, (Runnable) iterator2::next);
+    }
+
+    void Iterable_remove();
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/MutableOrderedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableOrderedIterableTestCase.java
new file mode 100644
index 000000000..d83399d90
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableOrderedIterableTestCase.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface MutableOrderedIterableTestCase extends OrderedIterableTestCase
+{
+    @Test
+    @Override
+    default void Iterable_remove()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        iterator.next();
+        iterator.remove();
+        assertEquals(this.newWith(3, 3, 2, 2, 1), iterable);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/MutableSortedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableSortedIterableTestCase.java
new file mode 100644
index 000000000..648e4427c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableSortedIterableTestCase.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface MutableSortedIterableTestCase extends MutableOrderedIterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        assertEquals(Integer.valueOf(3), iterator.next());
+        iterator.remove();
+        assertEquals(this.newWith(2, 1), iterable);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/MutableUnorderedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableUnorderedIterableTestCase.java
new file mode 100644
index 000000000..f7f565ff7
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/MutableUnorderedIterableTestCase.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import com.gs.collections.impl.utility.Iterate;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.Assert.assertThat;
+
+public interface MutableUnorderedIterableTestCase extends UnorderedIterableTestCase
+{
+    @Test
+    @Override
+    default void Iterable_remove()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        iterator.next();
+        iterator.remove();
+        assertEquals(this.allowsDuplicates() ? 5 : 2, Iterate.sizeOf(iterable));
+        assertThat(
+                iterable,
+                isOneOf(
+                        this.newWith(3, 3, 3, 2, 2),
+                        this.newWith(3, 3, 3, 2, 1),
+                        this.newWith(3, 3, 2, 2, 1)));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/NoIteratorTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/NoIteratorTestCase.java
new file mode 100644
index 000000000..cdb05c3e3
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/NoIteratorTestCase.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import org.junit.Test;
+
+public interface NoIteratorTestCase extends RichIterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getFirst()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getLast()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void RichIterable_iterator_iterationOrder()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void Iterable_hasNext()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void Iterable_next_throws_on_empty()
+    {
+        // Not applicable
+    }
+
+    @Override
+    @Test
+    default void Iterable_next_throws_at_end()
+    {
+        // Not applicable
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableTestCase.java
new file mode 100644
index 000000000..07a266d17
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableTestCase.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import com.gs.collections.impl.block.factory.Comparators;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertSame;
+
+public interface OrderedIterableTestCase extends RichIterableTestCase
+{
+    @Test
+    default void OrderedIterable_getFirst()
+    {
+        assertEquals(Integer.valueOf(3), this.newWith(3, 3, 3, 2, 2, 1).getFirst());
+    }
+
+    @Test
+    default void OrderedIterable_getLast()
+    {
+        assertEquals(Integer.valueOf(1), this.newWith(3, 3, 3, 2, 2, 1).getLast());
+    }
+
+    @Test
+    default void OrderedIterable_next()
+    {
+        Iterator<Integer> iterator = this.newWith(3, 2, 1).iterator();
+        assertEquals(Integer.valueOf(3), iterator.next());
+        assertEquals(Integer.valueOf(2), iterator.next());
+        assertEquals(Integer.valueOf(1), iterator.next());
+    }
+
+    @Test
+    default void OrderedIterable_min()
+    {
+        Holder<Integer> first = new Holder<>(-1);
+        Holder<Integer> second = new Holder<>(-1);
+        assertSame(first, this.newWith(new Holder<>(2), first, new Holder<>(0), second).min());
+    }
+
+    @Test
+    default void OrderedIterable_max()
+    {
+        Holder<Integer> first = new Holder<>(1);
+        Holder<Integer> second = new Holder<>(1);
+        assertSame(first, this.newWith(new Holder<>(-2), first, new Holder<>(0), second).max());
+    }
+
+    @Test
+    default void OrderedIterable_min_comparator()
+    {
+        Holder<Integer> first = new Holder<>(1);
+        Holder<Integer> second = new Holder<>(1);
+        assertSame(first, this.newWith(new Holder<>(-2), first, new Holder<>(0), second).min(Comparators.reverseNaturalOrder()));
+    }
+
+    @Test
+    default void OrderedIterable_max_comparator()
+    {
+        Holder<Integer> first = new Holder<>(-1);
+        Holder<Integer> second = new Holder<>(-1);
+        assertSame(first, this.newWith(new Holder<>(2), first, new Holder<>(0), second).max(Comparators.reverseNaturalOrder()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableWithDuplicatesTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableWithDuplicatesTestCase.java
new file mode 100644
index 000000000..378ed69c6
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/OrderedIterableWithDuplicatesTestCase.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertArrayEquals;
+
+public interface OrderedIterableWithDuplicatesTestCase extends RichIterableWithDuplicatesTestCase, OrderedIterableTestCase
+{
+    @Test
+    default void OrderedIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 3, 3, 2, 2, 1).toArray();
+        assertArrayEquals(new Object[]{3, 3, 3, 2, 2, 1}, array);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableTestCase.java
new file mode 100644
index 000000000..d22039f4c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableTestCase.java
@@ -0,0 +1,1387 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.gs.collections.api.BooleanIterable;
+import com.gs.collections.api.ByteIterable;
+import com.gs.collections.api.CharIterable;
+import com.gs.collections.api.DoubleIterable;
+import com.gs.collections.api.FloatIterable;
+import com.gs.collections.api.IntIterable;
+import com.gs.collections.api.LongIterable;
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.ShortIterable;
+import com.gs.collections.api.block.function.Function;
+import com.gs.collections.api.block.function.Function2;
+import com.gs.collections.api.block.function.primitive.DoubleObjectToDoubleFunction;
+import com.gs.collections.api.block.function.primitive.FloatObjectToFloatFunction;
+import com.gs.collections.api.block.function.primitive.IntObjectToIntFunction;
+import com.gs.collections.api.block.function.primitive.LongObjectToLongFunction;
+import com.gs.collections.api.block.function.primitive.ShortFunction;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.collection.primitive.MutableBooleanCollection;
+import com.gs.collections.api.collection.primitive.MutableByteCollection;
+import com.gs.collections.api.collection.primitive.MutableCharCollection;
+import com.gs.collections.api.collection.primitive.MutableDoubleCollection;
+import com.gs.collections.api.collection.primitive.MutableFloatCollection;
+import com.gs.collections.api.collection.primitive.MutableIntCollection;
+import com.gs.collections.api.collection.primitive.MutableLongCollection;
+import com.gs.collections.api.collection.primitive.MutableShortCollection;
+import com.gs.collections.api.map.MapIterable;
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.api.multimap.Multimap;
+import com.gs.collections.api.multimap.MutableMultimap;
+import com.gs.collections.api.partition.PartitionIterable;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.collections.impl.bag.mutable.primitive.BooleanHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.ByteHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.CharHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.DoubleHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.FloatHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.IntHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.LongHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.ShortHashBag;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.block.factory.IntegerPredicates;
+import com.gs.collections.impl.block.factory.Predicates;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.block.factory.Procedures;
+import com.gs.collections.impl.block.function.AddFunction;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.impl.list.Interval;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
+import com.gs.collections.impl.multimap.bag.HashBagMultimap;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public interface RichIterableTestCase extends IterableTestCase
+{
+    @Override
+    <T> RichIterable<T> newWith(T... elements);
+
+    <T> RichIterable<T> getExpectedFiltered(T... elements);
+
+    <T> RichIterable<T> getExpectedTransformed(T... elements);
+
+    <T> MutableCollection<T> newMutableForFilter(T... elements);
+
+    <T> MutableCollection<T> newMutableForTransform(T... elements);
+
+    @Test
+    default void newMutable_sanity()
+    {
+        assertEquals(this.getExpectedFiltered(3, 2, 1), this.newMutableForFilter(3, 2, 1));
+    }
+
+    MutableBooleanCollection newBooleanForTransform(boolean... elements);
+
+    MutableByteCollection newByteForTransform(byte... elements);
+
+    MutableCharCollection newCharForTransform(char... elements);
+
+    MutableDoubleCollection newDoubleForTransform(double... elements);
+
+    MutableFloatCollection newFloatForTransform(float... elements);
+
+    MutableIntCollection newIntForTransform(int... elements);
+
+    MutableLongCollection newLongForTransform(long... elements);
+
+    MutableShortCollection newShortForTransform(short... elements);
+
+    default BooleanIterable getExpectedBoolean(boolean... elements)
+    {
+        return this.newBooleanForTransform(elements);
+    }
+
+    default ByteIterable getExpectedByte(byte... elements)
+    {
+        return this.newByteForTransform(elements);
+    }
+
+    default CharIterable getExpectedChar(char... elements)
+    {
+        return this.newCharForTransform(elements);
+    }
+
+    default DoubleIterable getExpectedDouble(double... elements)
+    {
+        return this.newDoubleForTransform(elements);
+    }
+
+    default FloatIterable getExpectedFloat(float... elements)
+    {
+        return this.newFloatForTransform(elements);
+    }
+
+    default IntIterable getExpectedInt(int... elements)
+    {
+        return this.newIntForTransform(elements);
+    }
+
+    default LongIterable getExpectedLong(long... elements)
+    {
+        return this.newLongForTransform(elements);
+    }
+
+    default ShortIterable getExpectedShort(short... elements)
+    {
+        return this.newShortForTransform(elements);
+    }
+
+    @Test
+    default void InternalIterable_forEach()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableCollection<Integer> result = this.newMutableForFilter();
+        iterable.forEach(Procedures.cast(i -> result.add(i + 10)));
+        assertEquals(this.newMutableForFilter(13, 13, 13, 12, 12, 11), result);
+    }
+
+    @Test
+    default void InternalIterable_forEachWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableCollection<Integer> result = this.newMutableForFilter();
+        iterable.forEachWith((argument1, argument2) -> result.add(argument1 + argument2), 10);
+        assertEquals(this.newMutableForFilter(13, 13, 13, 12, 12, 11), result);
+    }
+
+    @Test
+    default void RichIterable_size_empty()
+    {
+        assertEquals(0, this.newWith().size());
+    }
+
+    @Test
+    default void RichIterable_isEmpty()
+    {
+        assertFalse(this.newWith(3, 2, 1).isEmpty());
+        assertTrue(this.newWith().isEmpty());
+    }
+
+    @Test
+    default void RichIterable_notEmpty()
+    {
+        assertTrue(this.newWith(3, 2, 1).notEmpty());
+        assertFalse(this.newWith().notEmpty());
+    }
+
+    @Test
+    default void RichIterable_getFirst_empty_null()
+    {
+        assertNull(this.newWith().getFirst());
+    }
+
+    @Test
+    default void RichIterable_getLast_empty_null()
+    {
+        assertNull(this.newWith().getLast());
+    }
+
+    @Test
+    default void RichIterable_getFirst()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Integer first = iterable.getFirst();
+        assertThat(first, isOneOf(3, 2, 1));
+        assertEquals(iterable.iterator().next(), first);
+    }
+
+    @Test
+    default void RichIterable_getLast()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Integer last = iterable.getLast();
+        assertThat(last, isOneOf(3, 2, 1));
+        Iterator<Integer> iterator = iterable.iterator();
+        Integer iteratorLast = null;
+        while (iterator.hasNext())
+        {
+            iteratorLast = iterator.next();
+        }
+        assertEquals(iteratorLast, last);
+    }
+
+    @Test
+    default void RichIterable_getFirst_and_getLast()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 2, 1);
+        assertNotEquals(iterable.getFirst(), iterable.getLast());
+    }
+
+    @Test
+    default void RichIterable_contains()
+    {
+        assertTrue(this.newWith(3, 2, 1).contains(3));
+        assertTrue(this.newWith(3, 2, 1).contains(2));
+        assertTrue(this.newWith(3, 2, 1).contains(1));
+        assertFalse(this.newWith(3, 2, 1).contains(0));
+    }
+
+    @Test
+    default void RichIterable_containsAllIterable()
+    {
+        assertTrue(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(3)));
+        assertTrue(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(3, 2, 1)));
+        assertTrue(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(3, 3, 3)));
+        assertTrue(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(3, 3, 3, 3, 2, 2, 2, 1, 1)));
+        assertFalse(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(4)));
+        assertFalse(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(4, 4, 5)));
+        assertFalse(this.newWith(3, 2, 1).containsAllIterable(Lists.immutable.of(3, 2, 1, 0)));
+    }
+
+    @Test
+    default void RichIterable_containsAll()
+    {
+        assertTrue(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(3)));
+        assertTrue(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(3, 2, 1)));
+        assertTrue(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(3, 3, 3)));
+        assertTrue(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(3, 3, 3, 3, 2, 2, 2, 1, 1)));
+        assertFalse(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(4)));
+        assertFalse(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(4, 4, 5)));
+        assertFalse(this.newWith(3, 2, 1).containsAll(Lists.mutable.of(3, 2, 1, 0)));
+    }
+
+    @Test
+    default void RichIterable_containsAllArguments()
+    {
+        assertTrue(this.newWith(3, 2, 1).containsAllArguments(3));
+        assertTrue(this.newWith(3, 2, 1).containsAllArguments(3, 2, 1));
+        assertTrue(this.newWith(3, 2, 1).containsAllArguments(3, 3, 3));
+        assertTrue(this.newWith(3, 2, 1).containsAllArguments(3, 3, 3, 3, 2, 2, 2, 1, 1));
+        assertFalse(this.newWith(3, 2, 1).containsAllArguments(4));
+        assertFalse(this.newWith(3, 2, 1).containsAllArguments(4, 4, 5));
+        assertFalse(this.newWith(3, 2, 1).containsAllArguments(3, 2, 1, 0));
+    }
+
+    @Test
+    default void RichIterable_iterator_iterationOrder()
+    {
+        MutableCollection<Integer> iterationOrder = this.newMutableForFilter();
+        Iterator<Integer> iterator = this.getInstanceUnderTest().iterator();
+        while (iterator.hasNext())
+        {
+            iterationOrder.add(iterator.next());
+        }
+        assertEquals(this.expectedIterationOrder(), iterationOrder);
+
+        MutableCollection<Integer> expectedIterationOrder = this.expectedIterationOrder();
+        MutableCollection<Integer> forEachWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().forEachWith((each, param) -> forEachWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, forEachWithIterationOrder);
+
+        MutableCollection<Integer> forEachWithIndexIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().forEachWithIndex((each, index) -> forEachWithIndexIterationOrder.add(each));
+        assertEquals(expectedIterationOrder, forEachWithIndexIterationOrder);
+    }
+
+    @Test
+    default void RichIterable_iterationOrder()
+    {
+        MutableCollection<Integer> expectedIterationOrder = this.expectedIterationOrder();
+
+        MutableCollection<Integer> selectIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().select(selectIterationOrder::add);
+        assertEquals(expectedIterationOrder, selectIterationOrder);
+
+        MutableCollection<Integer> selectTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().select(selectTargetIterationOrder::add, new HashBag<>());
+        assertEquals(expectedIterationOrder, selectTargetIterationOrder);
+
+        MutableCollection<Integer> selectWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().selectWith((each, param) -> selectWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, selectWithIterationOrder);
+
+        MutableCollection<Integer> selectWithTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().selectWith((each, param) -> selectWithTargetIterationOrder.add(each), null, new HashBag<>());
+        assertEquals(expectedIterationOrder, selectWithTargetIterationOrder);
+
+        MutableCollection<Integer> rejectIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().reject(rejectIterationOrder::add);
+        assertEquals(expectedIterationOrder, rejectIterationOrder);
+
+        MutableCollection<Integer> rejectTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().reject(rejectTargetIterationOrder::add, new HashBag<>());
+        assertEquals(expectedIterationOrder, rejectTargetIterationOrder);
+
+        MutableCollection<Integer> rejectWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().rejectWith((each, param) -> rejectWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, rejectWithIterationOrder);
+
+        MutableCollection<Integer> rejectWithTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().rejectWith((each, param) -> rejectWithTargetIterationOrder.add(each), null, new HashBag<>());
+        assertEquals(expectedIterationOrder, rejectWithTargetIterationOrder);
+
+        MutableCollection<Integer> partitionIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().partition(partitionIterationOrder::add);
+        assertEquals(expectedIterationOrder, partitionIterationOrder);
+
+        MutableCollection<Integer> partitionWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().partitionWith((each, param) -> partitionWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, partitionWithIterationOrder);
+
+        MutableCollection<Integer> collectIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collect(collectIterationOrder::add);
+        assertEquals(expectedIterationOrder, collectIterationOrder);
+
+        MutableCollection<Integer> collectTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collect(collectTargetIterationOrder::add, new HashBag<>());
+        assertEquals(expectedIterationOrder, collectTargetIterationOrder);
+
+        MutableCollection<Integer> collectWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectWith((each, param) -> collectWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, collectWithIterationOrder);
+
+        MutableCollection<Integer> collectWithTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectWith((each, param) -> collectWithTargetIterationOrder.add(each), null, new HashBag<>());
+        assertEquals(expectedIterationOrder, collectWithTargetIterationOrder);
+
+        MutableCollection<Integer> collectIfPredicateIterationOrder = this.newMutableForFilter();
+        MutableCollection<Integer> collectIfFunctionIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectIf(collectIfPredicateIterationOrder::add, collectIfFunctionIterationOrder::add);
+        assertEquals(expectedIterationOrder, collectIfPredicateIterationOrder);
+        assertEquals(expectedIterationOrder, collectIfFunctionIterationOrder);
+
+        MutableCollection<Integer> collectIfPredicateTargetIterationOrder = this.newMutableForFilter();
+        MutableCollection<Integer> collectIfFunctionTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectIf(collectIfPredicateTargetIterationOrder::add, collectIfFunctionTargetIterationOrder::add, new HashBag<>());
+        assertEquals(expectedIterationOrder, collectIfPredicateTargetIterationOrder);
+        assertEquals(expectedIterationOrder, collectIfFunctionTargetIterationOrder);
+
+        MutableCollection<Integer> collectBooleanIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectBoolean(collectBooleanIterationOrder::add);
+        assertEquals(expectedIterationOrder, collectBooleanIterationOrder);
+
+        MutableCollection<Integer> collectBooleanTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectBoolean(collectBooleanTargetIterationOrder::add, new BooleanHashBag());
+        assertEquals(expectedIterationOrder, collectBooleanTargetIterationOrder);
+
+        MutableCollection<Integer> collectByteIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectByte((Integer each) ->
+        {
+            collectByteIterationOrder.add(each);
+            return (byte) 0;
+        });
+        assertEquals(expectedIterationOrder, collectByteIterationOrder);
+
+        MutableCollection<Integer> collectByteTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectByte((Integer each) ->
+        {
+            collectByteTargetIterationOrder.add(each);
+            return (byte) 0;
+        }, new ByteHashBag());
+        assertEquals(expectedIterationOrder, collectByteTargetIterationOrder);
+
+        MutableCollection<Integer> collectCharIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectChar((Integer each) ->
+        {
+            collectCharIterationOrder.add(each);
+            return ' ';
+        });
+        assertEquals(expectedIterationOrder, collectCharIterationOrder);
+
+        MutableCollection<Integer> collectCharTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectChar((Integer each) ->
+        {
+            collectCharTargetIterationOrder.add(each);
+            return ' ';
+        }, new CharHashBag());
+        assertEquals(expectedIterationOrder, collectCharTargetIterationOrder);
+
+        MutableCollection<Integer> collectDoubleIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectDouble((Integer each) ->
+        {
+            collectDoubleIterationOrder.add(each);
+            return 0.0;
+        });
+        assertEquals(expectedIterationOrder, collectDoubleIterationOrder);
+
+        MutableCollection<Integer> collectDoubleTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectDouble((Integer each) ->
+        {
+            collectDoubleTargetIterationOrder.add(each);
+            return 0.0;
+        }, new DoubleHashBag());
+        assertEquals(expectedIterationOrder, collectDoubleTargetIterationOrder);
+
+        MutableCollection<Integer> collectFloatIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectFloat((Integer each) ->
+        {
+            collectFloatIterationOrder.add(each);
+            return 0.0f;
+        });
+        assertEquals(expectedIterationOrder, collectFloatIterationOrder);
+
+        MutableCollection<Integer> collectFloatTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectFloat((Integer each) ->
+        {
+            collectFloatTargetIterationOrder.add(each);
+            return 0.0f;
+        }, new FloatHashBag());
+        assertEquals(expectedIterationOrder, collectFloatTargetIterationOrder);
+
+        MutableCollection<Integer> collectIntIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectInt((Integer each) ->
+        {
+            collectIntIterationOrder.add(each);
+            return 0;
+        });
+        assertEquals(expectedIterationOrder, collectIntIterationOrder);
+
+        MutableCollection<Integer> collectIntTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectInt((Integer each) ->
+        {
+            collectIntTargetIterationOrder.add(each);
+            return 0;
+        }, new IntHashBag());
+        assertEquals(expectedIterationOrder, collectIntTargetIterationOrder);
+
+        MutableCollection<Integer> collectLongIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectLong((Integer each) ->
+        {
+            collectLongIterationOrder.add(each);
+            return 0L;
+        });
+        assertEquals(expectedIterationOrder, collectLongIterationOrder);
+
+        MutableCollection<Integer> collectLongTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectLong((Integer each) ->
+        {
+            collectLongTargetIterationOrder.add(each);
+            return 0L;
+        }, new LongHashBag());
+        assertEquals(expectedIterationOrder, collectLongTargetIterationOrder);
+
+        MutableCollection<Integer> collectShortIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectShort(new ShortFunction<Integer>()
+        {
+            @Override
+            public short shortValueOf(Integer each)
+            {
+                collectShortIterationOrder.add(each);
+                return 0;
+            }
+        });
+        assertEquals(expectedIterationOrder, collectShortIterationOrder);
+
+        MutableCollection<Integer> collectShortTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().collectShort(new ShortFunction<Integer>()
+        {
+            @Override
+            public short shortValueOf(Integer each)
+            {
+                collectShortTargetIterationOrder.add(each);
+                return 0;
+            }
+        }, new ShortHashBag());
+        assertEquals(expectedIterationOrder, collectShortTargetIterationOrder);
+
+        MutableCollection<Integer> flatCollectIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().flatCollect(each -> Lists.immutable.with(flatCollectIterationOrder.add(each)));
+        assertEquals(expectedIterationOrder, flatCollectIterationOrder);
+
+        MutableCollection<Integer> flatCollectTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().flatCollect(each -> Lists.immutable.with(flatCollectTargetIterationOrder.add(each)), new HashBag<>());
+        assertEquals(expectedIterationOrder, flatCollectTargetIterationOrder);
+
+        MutableCollection<Integer> countIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().count(countIterationOrder::add);
+        assertEquals(expectedIterationOrder, countIterationOrder);
+
+        MutableCollection<Integer> countWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().countWith((each, param) -> countWithIterationOrder.add(each), null);
+        assertEquals(expectedIterationOrder, countWithIterationOrder);
+
+        MutableCollection<Integer> anySatisfyIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().anySatisfy(each -> {
+            anySatisfyIterationOrder.add(each);
+            return false;
+        });
+        assertEquals(expectedIterationOrder, anySatisfyIterationOrder);
+
+        MutableCollection<Integer> anySatisfyWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().anySatisfyWith((each, param) -> {
+            anySatisfyWithIterationOrder.add(each);
+            return false;
+        }, null);
+        assertEquals(expectedIterationOrder, anySatisfyWithIterationOrder);
+
+        MutableCollection<Integer> allSatisfyIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().allSatisfy(each -> {
+            allSatisfyIterationOrder.add(each);
+            return true;
+        });
+        assertEquals(expectedIterationOrder, allSatisfyIterationOrder);
+
+        MutableCollection<Integer> allSatisfyWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().allSatisfyWith((each, param) -> {
+            allSatisfyWithIterationOrder.add(each);
+            return true;
+        }, null);
+        assertEquals(expectedIterationOrder, allSatisfyWithIterationOrder);
+
+        MutableCollection<Integer> noneSatisfyIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().noneSatisfy(each -> {
+            noneSatisfyIterationOrder.add(each);
+            return false;
+        });
+        assertEquals(expectedIterationOrder, noneSatisfyIterationOrder);
+
+        MutableCollection<Integer> noneSatisfyWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().noneSatisfyWith((each, param) -> {
+            noneSatisfyWithIterationOrder.add(each);
+            return false;
+        }, null);
+        assertEquals(expectedIterationOrder, noneSatisfyWithIterationOrder);
+
+        MutableCollection<Integer> detectIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().detect(each -> {
+            detectIterationOrder.add(each);
+            return false;
+        });
+        assertEquals(expectedIterationOrder, detectIterationOrder);
+
+        MutableCollection<Integer> detectWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().detectWith((each, param) -> {
+            detectWithIterationOrder.add(each);
+            return false;
+        }, null);
+        assertEquals(expectedIterationOrder, detectWithIterationOrder);
+
+        MutableCollection<Integer> detectIfNoneIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().detectIfNone(each -> {
+            detectIfNoneIterationOrder.add(each);
+            return false;
+        }, () -> 0);
+        assertEquals(expectedIterationOrder, detectIfNoneIterationOrder);
+
+        MutableCollection<Integer> detectWithIfNoneIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().detectWithIfNone((each, param) -> {
+            detectWithIfNoneIterationOrder.add(each);
+            return false;
+        }, null, () -> 0);
+        assertEquals(expectedIterationOrder, detectWithIfNoneIterationOrder);
+
+        MutableCollection<Integer> minComparatorIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().min(new Comparator<Integer>()
+        {
+            @Override
+            public int compare(Integer o1, Integer o2)
+            {
+                if (minComparatorIterationOrder.isEmpty())
+                {
+                    minComparatorIterationOrder.add(o2);
+                }
+                minComparatorIterationOrder.add(o1);
+                return 0;
+            }
+        });
+        assertEquals(expectedIterationOrder, minComparatorIterationOrder);
+
+        MutableCollection<Integer> maxComparatorIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().max(new Comparator<Integer>()
+        {
+            @Override
+            public int compare(Integer o1, Integer o2)
+            {
+                if (maxComparatorIterationOrder.isEmpty())
+                {
+                    maxComparatorIterationOrder.add(o2);
+                }
+                maxComparatorIterationOrder.add(o1);
+                return 0;
+            }
+        });
+        assertEquals(expectedIterationOrder, maxComparatorIterationOrder);
+
+        MutableCollection<Integer> minByIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().minBy(minByIterationOrder::add);
+        assertEquals(expectedIterationOrder, minByIterationOrder);
+
+        MutableCollection<Integer> maxByIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().maxBy(maxByIterationOrder::add);
+        assertEquals(expectedIterationOrder, maxByIterationOrder);
+
+        MutableCollection<Integer> groupByIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().groupBy(groupByIterationOrder::add);
+        assertEquals(expectedIterationOrder, groupByIterationOrder);
+
+        MutableCollection<Integer> groupByTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().groupBy(groupByTargetIterationOrder::add, new HashBagMultimap<>());
+        assertEquals(expectedIterationOrder, groupByTargetIterationOrder);
+
+        MutableCollection<Integer> groupByEachIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().groupByEach(each -> {
+            groupByEachIterationOrder.add(each);
+            return Lists.immutable.with(each);
+        });
+        assertEquals(expectedIterationOrder, groupByEachIterationOrder);
+
+        MutableCollection<Integer> groupByEachTargetIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().groupByEach(each -> {
+            groupByEachTargetIterationOrder.add(each);
+            return Lists.immutable.with(each);
+        }, new HashBagMultimap<Integer, Integer>());
+        assertEquals(expectedIterationOrder, groupByEachTargetIterationOrder);
+
+        MutableCollection<Integer> sumOfFloatIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().sumOfFloat(each -> {
+            sumOfFloatIterationOrder.add(each);
+            return each.floatValue();
+        });
+        assertEquals(expectedIterationOrder, sumOfFloatIterationOrder);
+
+        MutableCollection<Integer> sumOfDoubleIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().sumOfDouble(each -> {
+            sumOfDoubleIterationOrder.add(each);
+            return each.doubleValue();
+        });
+        assertEquals(expectedIterationOrder, sumOfDoubleIterationOrder);
+
+        MutableCollection<Integer> sumOfIntIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().sumOfInt(each -> {
+            sumOfIntIterationOrder.add(each);
+            return each.intValue();
+        });
+        assertEquals(expectedIterationOrder, sumOfIntIterationOrder);
+
+        MutableCollection<Integer> sumOfLongIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().sumOfLong(each -> {
+            sumOfLongIterationOrder.add(each);
+            return each.longValue();
+        });
+        assertEquals(expectedIterationOrder, sumOfLongIterationOrder);
+
+        MutableCollection<Integer> injectIntoIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectInto(0, new Function2<Integer, Integer, Integer>()
+        {
+            public Integer value(Integer argument1, Integer argument2)
+            {
+                injectIntoIterationOrder.add(argument2);
+                return argument1 + argument2;
+            }
+        });
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoIterationOrder);
+
+        MutableCollection<Integer> injectIntoIntIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectInto(0, new IntObjectToIntFunction<Integer>()
+        {
+            public int intValueOf(int intParameter, Integer objectParameter)
+            {
+                injectIntoIntIterationOrder.add(objectParameter);
+                return intParameter + objectParameter;
+            }
+        });
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoIntIterationOrder);
+
+        MutableCollection<Integer> injectIntoLongIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectInto(0L, new LongObjectToLongFunction<Integer>()
+        {
+            public long longValueOf(long longParameter, Integer objectParameter)
+            {
+                injectIntoLongIterationOrder.add(objectParameter);
+                return longParameter + objectParameter;
+            }
+        });
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoLongIterationOrder);
+
+        MutableCollection<Integer> injectIntoDoubleIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectInto(0L, new DoubleObjectToDoubleFunction<Integer>()
+        {
+            public double doubleValueOf(double doubleParameter, Integer objectParameter)
+            {
+                injectIntoDoubleIterationOrder.add(objectParameter);
+                return doubleParameter + objectParameter;
+            }
+        });
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoDoubleIterationOrder);
+
+        MutableCollection<Integer> injectIntoFloatIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectInto(0L, new FloatObjectToFloatFunction<Integer>()
+        {
+            public float floatValueOf(float floatParameter, Integer objectParameter)
+            {
+                injectIntoFloatIterationOrder.add(objectParameter);
+                return floatParameter + objectParameter;
+            }
+        });
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoFloatIterationOrder);
+    }
+
+    default MutableCollection<Integer> expectedIterationOrder()
+    {
+        MutableCollection<Integer> forEach = this.newMutableForFilter();
+        this.getInstanceUnderTest().forEach(Procedures.cast(forEach::add));
+        return forEach;
+    }
+
+    default RichIterable<Integer> getInstanceUnderTest()
+    {
+        return this.allowsDuplicates()
+                ? this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1)
+                : this.newWith(4, 3, 2, 1);
+    }
+
+    @Test
+    default void RichIterable_select()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 4, 4, 4, 2, 2),
+                iterable.select(IntegerPredicates.isEven()));
+    }
+
+    @Test
+    default void RichIterable_select_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.newMutableForFilter(4, 4, 4, 4, 2, 2),
+                iterable.select(IntegerPredicates.isEven(), this.<Integer>newMutableForFilter()));
+    }
+
+    @Test
+    default void RichIterable_selectWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 4, 4, 4, 3, 3, 3),
+                iterable.selectWith(Predicates2.greaterThan(), 2));
+    }
+
+    @Test
+    default void RichIterable_selectWith_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3),
+                iterable.selectWith(Predicates2.<Integer>greaterThan(), 2, this.<Integer>newMutableForFilter()));
+    }
+
+    @Test
+    default void RichIterable_reject()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 4, 4, 4, 2, 2),
+                iterable.reject(IntegerPredicates.isOdd()));
+    }
+
+    @Test
+    default void RichIterable_reject_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.newMutableForFilter(4, 4, 4, 4, 2, 2),
+                iterable.reject(IntegerPredicates.isOdd(), this.<Integer>newMutableForFilter()));
+    }
+
+    @Test
+    default void RichIterable_rejectWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 4, 4, 4, 3, 3, 3),
+                iterable.rejectWith(Predicates2.lessThan(), 3));
+    }
+
+    @Test
+    default void RichIterable_rejectWith_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(
+                this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3),
+                iterable.rejectWith(Predicates2.<Integer>lessThan(), 3, this.<Integer>newMutableForFilter()));
+    }
+
+    @Test
+    default void RichIterable_partition()
+    {
+        RichIterable<Integer> iterable = this.newWith(-3, -3, -3, -2, -2, -1, 0, 1, 2, 2, 3, 3, 3);
+        PartitionIterable<Integer> result = iterable.partition(IntegerPredicates.isEven());
+        assertEquals(this.getExpectedFiltered(-2, -2, 0, 2, 2), result.getSelected());
+        assertEquals(this.getExpectedFiltered(-3, -3, -3, -1, 1, 3, 3, 3), result.getRejected());
+    }
+
+    @Test
+    default void RichIterable_partitionWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(-3, -3, -3, -2, -2, -1, 0, 1, 2, 2, 3, 3, 3);
+        PartitionIterable<Integer> result = iterable.partitionWith(Predicates2.greaterThan(), 0);
+        assertEquals(this.getExpectedFiltered(1, 2, 2, 3, 3, 3), result.getSelected());
+        assertEquals(this.getExpectedFiltered(-3, -3, -3, -2, -2, -1, 0), result.getRejected());
+    }
+
+    @Test
+    default void RichIterable_selectInstancesOf()
+    {
+        RichIterable<Number> iterable = this.<Number>newWith(1, 2.0, 2.0, 3, 3, 3, 4.0, 4.0, 4.0, 4.0);
+        assertEquals(this.getExpectedFiltered(1, 3, 3, 3), iterable.selectInstancesOf(Integer.class));
+        assertEquals(this.getExpectedFiltered(1, 2.0, 2.0, 3, 3, 3, 4.0, 4.0, 4.0, 4.0), iterable.selectInstancesOf(Number.class));
+    }
+
+    @Test
+    default void RichIterable_collect()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collect(i -> i % 10));
+    }
+
+    @Test
+    default void RichIterable_collect_target()
+    {
+        assertEquals(
+                this.newMutableForTransform(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collect(i -> i % 10, this.newMutableForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectWith()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectWith((i, mod) -> i % mod, 10));
+    }
+
+    @Test
+    default void RichIterable_collectWith_target()
+    {
+        assertEquals(
+                this.newMutableForTransform(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectWith((i, mod) -> i % mod, 10, this.newMutableForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectIf()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 3, 1, 1, 3, 3, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectIf(i -> i % 2 != 0, i -> i % 10));
+    }
+
+    @Test
+    default void RichIterable_collectIf_target()
+    {
+        assertEquals(
+                this.newMutableForTransform(3, 3, 1, 1, 3, 3, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectIf(i -> i % 2 != 0, i -> i % 10, this.newMutableForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectBoolean()
+    {
+        assertEquals(
+                this.getExpectedBoolean(false, false, true, true, false, false),
+                this.newWith(3, 3, 2, 2, 1, 1).collectBoolean(each -> each % 2 == 0));
+    }
+
+    @Test
+    default void RichIterable_collectBoolean_target()
+    {
+        assertEquals(
+                this.newBooleanForTransform(false, false, true, true, false, false),
+                this.newWith(3, 3, 2, 2, 1, 1).collectBoolean(each -> each % 2 == 0, this.newBooleanForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectByte()
+    {
+        assertEquals(
+                this.getExpectedByte((byte) 3, (byte) 3, (byte) 2, (byte) 2, (byte) 1, (byte) 1, (byte) 3, (byte) 3, (byte) 2, (byte) 2, (byte) 1, (byte) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectByte(each -> (byte) (each % 10)));
+    }
+
+    @Test
+    default void RichIterable_collectByte_target()
+    {
+        assertEquals(
+                this.newByteForTransform((byte) 3, (byte) 3, (byte) 2, (byte) 2, (byte) 1, (byte) 1, (byte) 3, (byte) 3, (byte) 2, (byte) 2, (byte) 1, (byte) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectByte(each -> (byte) (each % 10), this.newByteForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectChar()
+    {
+        assertEquals(
+                this.getExpectedChar((char) 3, (char) 3, (char) 2, (char) 2, (char) 1, (char) 1, (char) 3, (char) 3, (char) 2, (char) 2, (char) 1, (char) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectChar(each -> (char) (each % 10)));
+    }
+
+    @Test
+    default void RichIterable_collectChar_target()
+    {
+        assertEquals(
+                this.newCharForTransform((char) 3, (char) 3, (char) 2, (char) 2, (char) 1, (char) 1, (char) 3, (char) 3, (char) 2, (char) 2, (char) 1, (char) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectChar(each -> (char) (each % 10), this.newCharForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectDouble()
+    {
+        assertEquals(
+                this.getExpectedDouble(3.0, 3.0, 2.0, 2.0, 1.0, 1.0, 3.0, 3.0, 2.0, 2.0, 1.0, 1.0),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectDouble(each -> (double) (each % 10)));
+    }
+
+    @Test
+    default void RichIterable_collectDouble_target()
+    {
+        assertEquals(
+                this.newDoubleForTransform(3.0, 3.0, 2.0, 2.0, 1.0, 1.0, 3.0, 3.0, 2.0, 2.0, 1.0, 1.0),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectDouble(each -> (double) (each % 10), this.newDoubleForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectFloat()
+    {
+        assertEquals(
+                this.getExpectedFloat(3.0f, 3.0f, 2.0f, 2.0f, 1.0f, 1.0f, 3.0f, 3.0f, 2.0f, 2.0f, 1.0f, 1.0f),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectFloat(each -> (float) (each % 10)));
+    }
+
+    @Test
+    default void RichIterable_collectFloat_target()
+    {
+        assertEquals(
+                this.newFloatForTransform(3.0f, 3.0f, 2.0f, 2.0f, 1.0f, 1.0f, 3.0f, 3.0f, 2.0f, 2.0f, 1.0f, 1.0f),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectFloat(each -> (float) (each % 10), this.newFloatForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectInt()
+    {
+        assertEquals(
+                this.getExpectedInt(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectInt(each -> each % 10));
+    }
+
+    @Test
+    default void RichIterable_collectInt_target()
+    {
+        assertEquals(
+                this.newIntForTransform(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectInt(each -> each % 10, this.newIntForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectLong()
+    {
+        assertEquals(
+                this.getExpectedLong(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectLong(each -> each % 10));
+    }
+
+    @Test
+    default void RichIterable_collectLong_target()
+    {
+        assertEquals(
+                this.newLongForTransform(3, 3, 2, 2, 1, 1, 3, 3, 2, 2, 1, 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectLong(each -> each % 10, this.newLongForTransform()));
+    }
+
+    @Test
+    default void RichIterable_collectShort()
+    {
+        assertEquals(
+                this.getExpectedShort((short) 3, (short) 3, (short) 2, (short) 2, (short) 1, (short) 1, (short) 3, (short) 3, (short) 2, (short) 2, (short) 1, (short) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectShort(each -> (short) (each % 10)));
+    }
+
+    @Test
+    default void RichIterable_collectShort_target()
+    {
+        assertEquals(
+                this.newShortForTransform((short) 3, (short) 3, (short) 2, (short) 2, (short) 1, (short) 1, (short) 3, (short) 3, (short) 2, (short) 2, (short) 1, (short) 1),
+                this.newWith(13, 13, 12, 12, 11, 11, 3, 3, 2, 2, 1, 1).collectShort(each -> (short) (each % 10), this.newShortForTransform()));
+    }
+
+    @Test
+    default void RichIterable_flatCollect()
+    {
+        assertEquals(
+                this.getExpectedTransformed(1, 2, 3, 1, 2, 1, 2, 1),
+                this.newWith(3, 2, 2, 1).flatCollect(Interval::oneTo));
+    }
+
+    @Test
+    default void RichIterable_flatCollect_target()
+    {
+        assertEquals(
+                this.newMutableForTransform(1, 2, 3, 1, 2, 1, 2, 1),
+                this.newWith(3, 2, 2, 1).flatCollect(Interval::oneTo, this.newMutableForTransform()));
+    }
+
+    @Test
+    default void RichIterable_count()
+    {
+        assertEquals(3, this.newWith(3, 3, 3, 2, 2, 1).count(Integer.valueOf(3)::equals));
+        assertEquals(2, this.newWith(3, 3, 3, 2, 2, 1).count(Integer.valueOf(2)::equals));
+        assertEquals(1, this.newWith(3, 3, 3, 2, 2, 1).count(Integer.valueOf(1)::equals));
+        assertEquals(0, this.newWith(3, 3, 3, 2, 2, 1).count(Integer.valueOf(0)::equals));
+        assertEquals(4, this.newWith(3, 3, 3, 2, 2, 1).count(i -> i % 2 != 0));
+        assertEquals(6, this.newWith(3, 3, 3, 2, 2, 1).count(i -> i > 0));
+    }
+
+    @Test
+    default void RichIterable_countWith()
+    {
+        assertEquals(3, this.newWith(3, 3, 3, 2, 2, 1).countWith(Object::equals, 3));
+        assertEquals(2, this.newWith(3, 3, 3, 2, 2, 1).countWith(Object::equals, 2));
+        assertEquals(1, this.newWith(3, 3, 3, 2, 2, 1).countWith(Object::equals, 1));
+        assertEquals(0, this.newWith(3, 3, 3, 2, 2, 1).countWith(Object::equals, 0));
+        assertEquals(6, this.newWith(3, 3, 3, 2, 2, 1).countWith(Predicates2.greaterThan(), 0));
+    }
+
+    @Test
+    default void RichIterable_anySatisfy()
+    {
+        assertTrue(this.newWith(3, 2, 1).anySatisfy(Predicates.greaterThan(0)));
+        assertTrue(this.newWith(3, 2, 1).anySatisfy(Predicates.greaterThan(1)));
+        assertTrue(this.newWith(3, 2, 1).anySatisfy(Predicates.greaterThan(2)));
+        assertFalse(this.newWith(3, 2, 1).anySatisfy(Predicates.greaterThan(3)));
+    }
+
+    @Test
+    default void RichIterable_anySatisfyWith()
+    {
+        assertTrue(this.newWith(3, 2, 1).anySatisfyWith(Predicates2.greaterThan(), 0));
+        assertTrue(this.newWith(3, 2, 1).anySatisfyWith(Predicates2.greaterThan(), 1));
+        assertTrue(this.newWith(3, 2, 1).anySatisfyWith(Predicates2.greaterThan(), 2));
+        assertFalse(this.newWith(3, 2, 1).anySatisfyWith(Predicates2.greaterThan(), 3));
+    }
+
+    @Test
+    default void RichIterable_allSatisfy()
+    {
+        assertTrue(this.newWith(3, 2, 1).allSatisfy(Predicates.greaterThan(0)));
+        assertFalse(this.newWith(3, 2, 1).allSatisfy(Predicates.greaterThan(1)));
+        assertFalse(this.newWith(3, 2, 1).allSatisfy(Predicates.greaterThan(2)));
+        assertFalse(this.newWith(3, 2, 1).allSatisfy(Predicates.greaterThan(3)));
+    }
+
+    @Test
+    default void RichIterable_allSatisfyWith()
+    {
+        assertTrue(this.newWith(3, 2, 1).allSatisfyWith(Predicates2.greaterThan(), 0));
+        assertFalse(this.newWith(3, 2, 1).allSatisfyWith(Predicates2.greaterThan(), 1));
+        assertFalse(this.newWith(3, 2, 1).allSatisfyWith(Predicates2.greaterThan(), 2));
+        assertFalse(this.newWith(3, 2, 1).allSatisfyWith(Predicates2.greaterThan(), 3));
+    }
+
+    @Test
+    default void RichIterable_noneSatisfy()
+    {
+        assertFalse(this.newWith(3, 2, 1).noneSatisfy(Predicates.greaterThan(0)));
+        assertFalse(this.newWith(3, 2, 1).noneSatisfy(Predicates.greaterThan(1)));
+        assertFalse(this.newWith(3, 2, 1).noneSatisfy(Predicates.greaterThan(2)));
+        assertTrue(this.newWith(3, 2, 1).noneSatisfy(Predicates.greaterThan(3)));
+    }
+
+    @Test
+    default void RichIterable_noneSatisfyWith()
+    {
+        assertFalse(this.newWith(3, 2, 1).noneSatisfyWith(Predicates2.greaterThan(), 0));
+        assertFalse(this.newWith(3, 2, 1).noneSatisfyWith(Predicates2.greaterThan(), 1));
+        assertFalse(this.newWith(3, 2, 1).noneSatisfyWith(Predicates2.greaterThan(), 2));
+        assertTrue(this.newWith(3, 2, 1).noneSatisfyWith(Predicates2.greaterThan(), 3));
+    }
+
+    @Test
+    default void RichIterable_detect()
+    {
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(0)), is(3));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(1)), is(3));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(2)), is(3));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(3)), nullValue());
+
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(1)), nullValue());
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(2)), is(1));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(3)), is(2));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(4)), is(3));
+    }
+
+    @Test
+    default void RichIterable_detectWith()
+    {
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 0), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 1), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 2), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 3), nullValue());
+
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 1), nullValue());
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 2), is(1));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 3), is(2));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 4), is(3));
+    }
+
+    @Test
+    default void RichIterable_detectIfNone()
+    {
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(0), () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(1), () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(2), () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(3), () -> 4), is(4));
+
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(1), () -> 4), is(4));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(2), () -> 4), is(1));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(3), () -> 4), is(2));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(4), () -> 4), is(3));
+    }
+
+    @Test
+    default void RichIterable_detectWithIfNone()
+    {
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 0, () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 1, () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 2, () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 3, () -> 4), is(4));
+
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 1, () -> 4), is(4));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 2, () -> 4), is(1));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 3, () -> 4), is(2));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 4, () -> 4), is(3));
+    }
+
+    @Test
+    default void RichIterable_min()
+    {
+        assertEquals(Integer.valueOf(-1), this.newWith(-1, 0, 1).min());
+        assertEquals(Integer.valueOf(-1), this.newWith(1, 0, -1).min());
+
+        assertThrows(NoSuchElementException.class, () -> this.newWith().min());
+    }
+
+    @Test
+    default void RichIterable_min_non_comparable()
+    {
+        Object sentinel = new Object();
+        assertSame(sentinel, this.newWith(sentinel).min());
+
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object(), new Object()).min());
+    }
+
+    @Test
+    default void RichIterable_max()
+    {
+        assertEquals(Integer.valueOf(1), this.newWith(-1, 0, 1).max());
+        assertEquals(Integer.valueOf(1), this.newWith(1, 0, -1).max());
+
+        assertThrows(NoSuchElementException.class, () -> this.newWith().max());
+    }
+
+    @Test
+    default void RichIterable_max_non_comparable()
+    {
+        Object sentinel = new Object();
+        assertSame(sentinel, this.newWith(sentinel).max());
+
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object(), new Object()).max());
+    }
+
+    @Test
+    default void RichIterable_min_comparator()
+    {
+        assertEquals(Integer.valueOf(1), this.newWith(-1, 0, 1).min(Comparators.reverseNaturalOrder()));
+        assertEquals(Integer.valueOf(1), this.newWith(1, 0, -1).min(Comparators.reverseNaturalOrder()));
+
+        assertThrows(NoSuchElementException.class, () -> this.newWith().min(Comparators.reverseNaturalOrder()));
+    }
+
+    @Test
+    default void RichIterable_min_comparator_non_comparable()
+    {
+        Object sentinel = new Object();
+        assertSame(sentinel, this.newWith(sentinel).min(Comparators.reverseNaturalOrder()));
+
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object(), new Object()).min(Comparators.reverseNaturalOrder()));
+    }
+
+    @Test
+    default void RichIterable_max_comparator()
+    {
+        assertEquals(Integer.valueOf(-1), this.newWith(-1, 0, 1).max(Comparators.reverseNaturalOrder()));
+        assertEquals(Integer.valueOf(-1), this.newWith(1, 0, -1).max(Comparators.reverseNaturalOrder()));
+
+        assertThrows(NoSuchElementException.class, () -> this.newWith().max(Comparators.reverseNaturalOrder()));
+    }
+
+    @Test
+    default void RichIterable_max_comparator_non_comparable()
+    {
+        Object sentinel = new Object();
+        assertSame(sentinel, this.newWith(sentinel).max(Comparators.reverseNaturalOrder()));
+
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object(), new Object()).max(Comparators.reverseNaturalOrder()));
+    }
+
+    @Test
+    default void RichIterable_minBy()
+    {
+        assertEquals("da", this.newWith("ed", "da", "ca", "bc", "ab").minBy(string -> string.charAt(string.length() - 1)));
+
+        assertThrows(NoSuchElementException.class, () -> this.<String>newWith().minBy(string -> string.charAt(string.length() - 1)));
+    }
+
+    @Test
+    default void RichIterable_maxBy()
+    {
+        assertEquals("dz", this.newWith("ew", "dz", "cz", "bx", "ay").maxBy(string -> string.charAt(string.length() - 1)));
+
+        assertThrows(NoSuchElementException.class, () -> this.<String>newWith().maxBy(string -> string.charAt(string.length() - 1)));
+    }
+
+    @Test
+    default void RichIterable_groupBy()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        Function<Integer, Boolean> isOddFunction = object -> IntegerPredicates.isOdd().accept(object);
+
+        MutableMap<Boolean, RichIterable<Integer>> expected =
+                UnifiedMap.newWithKeysValues(
+                        Boolean.TRUE, this.newMutableForFilter(3, 3, 3, 1),
+                        Boolean.FALSE, this.newMutableForFilter(4, 4, 4, 4, 2, 2));
+
+        Multimap<Boolean, Integer> multimap = iterable.groupBy(isOddFunction);
+        assertEquals(expected, multimap.toMap());
+
+        Function<Integer, Boolean> function = (Integer object) -> true;
+        MutableMultimap<Boolean, Integer> multimap2 = iterable.groupBy(
+                isOddFunction,
+                this.<Integer>newWith().groupBy(function).toMutable());
+        assertEquals(expected, multimap2.toMap());
+    }
+
+    @Test
+    default void RichIterable_groupByEach()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+
+        Function<Integer, Iterable<Integer>> function = integer -> Interval.fromTo(-1, -integer);
+
+        MutableMap<Integer, RichIterable<Integer>> expected =
+                UnifiedMap.newWithKeysValues(
+                        -4, this.newMutableForFilter(4, 4, 4, 4),
+                        -3, this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3),
+                        -2, this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2),
+                        -1, this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1));
+
+        Multimap<Integer, Integer> multimap = iterable.groupByEach(function);
+        assertEquals(expected, multimap.toMap());
+
+        Multimap<Integer, Integer> actualWithTarget =
+                iterable.groupByEach(function, this.<Integer>newWith().groupByEach(function).toMutable());
+        assertEquals(expected, actualWithTarget.toMap());
+    }
+
+    @Test
+    default void RichIterable_aggregateBy_aggregateInPlaceBy()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+
+        MapIterable<String, Integer> aggregateBy = iterable.aggregateBy(
+                Object::toString,
+                () -> 0,
+                (integer1, integer2) -> integer1 + integer2);
+
+        assertEquals(16, aggregateBy.get("4").intValue());
+        assertEquals(9, aggregateBy.get("3").intValue());
+        assertEquals(4, aggregateBy.get("2").intValue());
+        assertEquals(1, aggregateBy.get("1").intValue());
+
+        MapIterable<String, AtomicInteger> aggregateInPlaceBy = iterable.aggregateInPlaceBy(
+                String::valueOf,
+                AtomicInteger::new,
+                AtomicInteger::addAndGet);
+        assertEquals(16, aggregateInPlaceBy.get("4").intValue());
+        assertEquals(9, aggregateInPlaceBy.get("3").intValue());
+        assertEquals(4, aggregateInPlaceBy.get("2").intValue());
+        assertEquals(1, aggregateInPlaceBy.get("1").intValue());
+    }
+
+    @Test
+    default void RichIterable_sumOfPrimitive()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        Assert.assertEquals(30.0f, iterable.sumOfFloat(Integer::floatValue), 0.001);
+        Assert.assertEquals(30.0, iterable.sumOfDouble(Integer::doubleValue), 0.001);
+        Assert.assertEquals(30, iterable.sumOfInt(integer -> integer));
+        Assert.assertEquals(30L, iterable.sumOfLong(Integer::longValue));
+    }
+
+    @Test
+    default void RichIterable_injectInto()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(Integer.valueOf(31), iterable.injectInto(1, AddFunction.INTEGER));
+        assertEquals(Integer.valueOf(30), iterable.injectInto(0, AddFunction.INTEGER));
+    }
+
+    @Test
+    default void RichIterable_injectInto_primitive()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+
+        Assert.assertEquals(31, iterable.injectInto(1, AddFunction.INTEGER_TO_INT));
+        Assert.assertEquals(30, iterable.injectInto(0, AddFunction.INTEGER_TO_INT));
+
+        Assert.assertEquals(31L, iterable.injectInto(1, AddFunction.INTEGER_TO_LONG));
+        Assert.assertEquals(30L, iterable.injectInto(0, AddFunction.INTEGER_TO_LONG));
+
+        Assert.assertEquals(31.0d, iterable.injectInto(1, AddFunction.INTEGER_TO_DOUBLE), 0.001);
+        Assert.assertEquals(30.0d, iterable.injectInto(0, AddFunction.INTEGER_TO_DOUBLE), 0.001);
+
+        Assert.assertEquals(31.0f, iterable.injectInto(1, AddFunction.INTEGER_TO_FLOAT), 0.001f);
+        Assert.assertEquals(30.0f, iterable.injectInto(0, AddFunction.INTEGER_TO_FLOAT), 0.001f);
+    }
+
+    // TODO to(Sorted)?(List|Set|Bag|Map)(By)?
+
+    class Holder<T extends Comparable<? super T>> implements Comparable<Holder<T>>
+    {
+        private final T field;
+
+        public Holder(T field)
+        {
+            this.field = field;
+        }
+
+        @Override
+        public int compareTo(Holder<T> other)
+        {
+            return this.field.compareTo(other.field);
+        }
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableUniqueTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableUniqueTestCase.java
new file mode 100644
index 000000000..d0e076735
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableUniqueTestCase.java
@@ -0,0 +1,583 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.block.function.Function;
+import com.gs.collections.api.block.function.Function2;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.map.MapIterable;
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.api.multimap.Multimap;
+import com.gs.collections.api.multimap.MutableMultimap;
+import com.gs.collections.api.partition.PartitionIterable;
+import com.gs.collections.impl.block.factory.IntegerPredicates;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.block.factory.Procedures;
+import com.gs.collections.impl.block.function.AddFunction;
+import com.gs.collections.impl.list.Interval;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertPostSerializedEqualsAndHashCode;
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public interface RichIterableUniqueTestCase extends RichIterableTestCase
+{
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Override
+    @Test
+    default void Object_equalsAndHashCode()
+    {
+        assertPostSerializedEqualsAndHashCode(this.newWith(3, 2, 1));
+
+        assertNotEquals(this.newWith(4, 3, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 3, 2, 1));
+
+        assertNotEquals(this.newWith(2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(2, 1));
+
+        assertNotEquals(this.newWith(4, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 2, 1));
+    }
+
+    @Test
+    default void Iterable_sanity_check()
+    {
+        String s = "";
+        assertThrows(IllegalStateException.class, () -> this.newWith(s, s));
+    }
+
+    @Override
+    @Test
+    default void InternalIterable_forEach()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 2, 1);
+        MutableCollection<Integer> result = this.newMutableForFilter();
+        iterable.forEach(Procedures.cast(i -> result.add(i + 10)));
+        assertEquals(this.newMutableForFilter(13, 12, 11), result);
+    }
+
+    @Override
+    @Test
+    default void InternalIterable_forEachWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 2, 1);
+        MutableCollection<Integer> result = this.newMutableForFilter();
+        iterable.forEachWith((argument1, argument2) -> result.add(argument1 + argument2), 10);
+        assertEquals(this.newMutableForFilter(13, 12, 11), result);
+    }
+
+    @Test
+    default void RichIterable_size()
+    {
+        assertEquals(3, this.newWith(3, 2, 1).size());
+    }
+
+    @Test
+    default void RichIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 2, 1).toArray();
+        assertArrayEquals(new Object[]{3, 2, 1}, array);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_select()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 2),
+                iterable.select(IntegerPredicates.isEven()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_select_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 2),
+                iterable.select(IntegerPredicates.isEven(), this.<Integer>newMutableForFilter()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_selectWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 3),
+                iterable.selectWith(Predicates2.greaterThan(), 2));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_selectWith_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 3),
+                iterable.selectWith(Predicates2.<Integer>greaterThan(), 2, this.<Integer>newMutableForFilter()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_reject()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 2),
+                iterable.reject(IntegerPredicates.isOdd()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_reject_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 2),
+                iterable.reject(IntegerPredicates.isOdd(), this.<Integer>newMutableForFilter()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_rejectWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 3),
+                iterable.rejectWith(Predicates2.lessThan(), 3));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_rejectWith_target()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(
+                this.getExpectedFiltered(4, 3),
+                iterable.rejectWith(Predicates2.<Integer>lessThan(), 3, this.<Integer>newMutableForFilter()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_partition()
+    {
+        RichIterable<Integer> iterable = this.newWith(-3, -2, -1, 0, 1, 2, 3);
+        PartitionIterable<Integer> result = iterable.partition(IntegerPredicates.isEven());
+        assertEquals(this.getExpectedFiltered(-2, 0, 2), result.getSelected());
+        assertEquals(this.getExpectedFiltered(-3, -1, 1, 3), result.getRejected());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_partitionWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(-3, -2, -1, 0, 1, 2, 3);
+        PartitionIterable<Integer> result = iterable.partitionWith(Predicates2.greaterThan(), 0);
+        assertEquals(this.getExpectedFiltered(1, 2, 3), result.getSelected());
+        assertEquals(this.getExpectedFiltered(-3, -2, -1, 0), result.getRejected());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_selectInstancesOf()
+    {
+        RichIterable<Number> iterable = this.<Number>newWith(1, 2.0, 3, 4.0);
+        assertEquals(this.getExpectedFiltered(), iterable.selectInstancesOf(String.class));
+        assertEquals(this.getExpectedFiltered(1, 3), iterable.selectInstancesOf(Integer.class));
+        assertEquals(this.getExpectedFiltered(1, 2.0, 3, 4.0), iterable.selectInstancesOf(Number.class));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collect()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collect(i -> i % 10));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collect_target()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collect(i -> i % 10, this.newMutableForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectWith()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectWith((i, mod) -> i % mod, 10));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectWith_target()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectWith((i, mod) -> i % mod, 10, this.newMutableForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectIf()
+    {
+        assertEquals(
+                this.getExpectedTransformed(3, 1, 3, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectIf(i -> i % 2 != 0, i -> i % 10));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectIf_target()
+    {
+        assertEquals(
+                this.newMutableForTransform(3, 1, 3, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectIf(i -> i % 2 != 0, i -> i % 10, this.newMutableForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectBoolean()
+    {
+        assertEquals(
+                this.getExpectedBoolean(false, true, false),
+                this.newWith(3, 2, 1).collectBoolean(each -> each % 2 == 0));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectBoolean_target()
+    {
+        assertEquals(
+                this.getExpectedBoolean(false, true, false),
+                this.newWith(3, 2, 1).collectBoolean(each -> each % 2 == 0, this.newBooleanForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectByte()
+    {
+        assertEquals(
+                this.getExpectedByte((byte) 3, (byte) 2, (byte) 1, (byte) 3, (byte) 2, (byte) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectByte(each -> (byte) (each % 10)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectByte_target()
+    {
+        assertEquals(
+                this.getExpectedByte((byte) 3, (byte) 2, (byte) 1, (byte) 3, (byte) 2, (byte) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectByte(each -> (byte) (each % 10), this.newByteForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectChar()
+    {
+        assertEquals(
+                this.getExpectedChar((char) 3, (char) 2, (char) 1, (char) 3, (char) 2, (char) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectChar(each -> (char) (each % 10)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectChar_target()
+    {
+        assertEquals(
+                this.getExpectedChar((char) 3, (char) 2, (char) 1, (char) 3, (char) 2, (char) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectChar(each -> (char) (each % 10), this.newCharForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectDouble()
+    {
+        assertEquals(
+                this.getExpectedDouble(3.0, 2.0, 1.0, 3.0, 2.0, 1.0),
+                this.newWith(13, 12, 11, 3, 2, 1).collectDouble(each -> (double) (each % 10)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectDouble_target()
+    {
+        assertEquals(
+                this.getExpectedDouble(3.0, 2.0, 1.0, 3.0, 2.0, 1.0),
+                this.newWith(13, 12, 11, 3, 2, 1).collectDouble(each -> (double) (each % 10), this.newDoubleForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectFloat()
+    {
+        assertEquals(
+                this.getExpectedFloat(3.0f, 2.0f, 1.0f, 3.0f, 2.0f, 1.0f),
+                this.newWith(13, 12, 11, 3, 2, 1).collectFloat(each -> (float) (each % 10)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectFloat_target()
+    {
+        assertEquals(
+                this.getExpectedFloat(3.0f, 2.0f, 1.0f, 3.0f, 2.0f, 1.0f),
+                this.newWith(13, 12, 11, 3, 2, 1).collectFloat(each -> (float) (each % 10), this.newFloatForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectInt()
+    {
+        assertEquals(
+                this.getExpectedInt(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectInt(each -> each % 10));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectInt_target()
+    {
+        assertEquals(
+                this.getExpectedInt(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectInt(each -> each % 10, this.newIntForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectLong()
+    {
+        assertEquals(
+                this.getExpectedLong(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectLong(each -> each % 10));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectLong_target()
+    {
+        assertEquals(
+                this.getExpectedLong(3, 2, 1, 3, 2, 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectLong(each -> each % 10, this.newLongForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectShort()
+    {
+        assertEquals(
+                this.getExpectedShort((short) 3, (short) 2, (short) 1, (short) 3, (short) 2, (short) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectShort(each -> (short) (each % 10)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_collectShort_target()
+    {
+        assertEquals(
+                this.getExpectedShort((short) 3, (short) 2, (short) 1, (short) 3, (short) 2, (short) 1),
+                this.newWith(13, 12, 11, 3, 2, 1).collectShort(each -> (short) (each % 10), this.newShortForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_flatCollect()
+    {
+        assertEquals(
+                this.getExpectedTransformed(1, 2, 3, 1, 2, 1),
+                this.newWith(3, 2, 1).flatCollect(Interval::oneTo));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_flatCollect_target()
+    {
+        assertEquals(
+                this.getExpectedTransformed(1, 2, 3, 1, 2, 1),
+                this.newWith(3, 2, 1).flatCollect(Interval::oneTo, this.newMutableForTransform()));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_count()
+    {
+        assertEquals(1, this.newWith(3, 2, 1).count(Integer.valueOf(3)::equals));
+        assertEquals(1, this.newWith(3, 2, 1).count(Integer.valueOf(2)::equals));
+        assertEquals(1, this.newWith(3, 2, 1).count(Integer.valueOf(1)::equals));
+        assertEquals(0, this.newWith(3, 2, 1).count(Integer.valueOf(0)::equals));
+        assertEquals(2, this.newWith(3, 2, 1).count(i -> i % 2 != 0));
+        assertEquals(3, this.newWith(3, 2, 1).count(i -> i > 0));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_countWith()
+    {
+        assertEquals(1, this.newWith(3, 2, 1).countWith(Object::equals, 3));
+        assertEquals(1, this.newWith(3, 2, 1).countWith(Object::equals, 2));
+        assertEquals(1, this.newWith(3, 2, 1).countWith(Object::equals, 1));
+        assertEquals(0, this.newWith(3, 2, 1).countWith(Object::equals, 0));
+        assertEquals(3, this.newWith(3, 2, 1).countWith(Predicates2.greaterThan(), 0));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_groupBy()
+    {
+        RichIterable<Integer> collection = this.newWith(4, 3, 2, 1);
+        Function<Integer, Boolean> isOddFunction = object -> IntegerPredicates.isOdd().accept(object);
+
+        MutableMap<Boolean, RichIterable<Integer>> expected =
+                UnifiedMap.newWithKeysValues(
+                        Boolean.TRUE, this.newMutableForFilter(3, 1),
+                        Boolean.FALSE, this.newMutableForFilter(4, 2));
+
+        Multimap<Boolean, Integer> multimap = collection.groupBy(isOddFunction);
+        assertEquals(expected, multimap.toMap());
+
+        Function<Integer, Boolean> function = (Integer object) -> true;
+        MutableMultimap<Boolean, Integer> multimap2 = collection.groupBy(
+                isOddFunction,
+                this.<Integer>newWith().groupBy(function).toMutable());
+        assertEquals(expected, multimap2.toMap());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_groupByEach()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+
+        Function<Integer, Iterable<Integer>> function = integer -> Interval.fromTo(-1, -integer);
+
+        MutableMap<Integer, RichIterable<Integer>> expected =
+                UnifiedMap.newWithKeysValues(
+                        -4, this.newMutableForFilter(4),
+                        -3, this.newMutableForFilter(4, 3),
+                        -2, this.newMutableForFilter(4, 3, 2),
+                        -1, this.newMutableForFilter(4, 3, 2, 1));
+
+        Multimap<Integer, Integer> multimap = iterable.groupByEach(function);
+        assertEquals(expected, multimap.toMap());
+
+        Multimap<Integer, Integer> actualWithTarget =
+                iterable.groupByEach(function, this.<Integer>newWith().groupByEach(function).toMutable());
+        assertEquals(expected, actualWithTarget.toMap());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_aggregateBy_aggregateInPlaceBy()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+
+        MapIterable<String, Integer> aggregateBy = iterable.aggregateBy(
+                Object::toString,
+                () -> 0,
+                (integer1, integer2) -> integer1 + integer2);
+
+        assertEquals(4, aggregateBy.get("4").intValue());
+        assertEquals(3, aggregateBy.get("3").intValue());
+        assertEquals(2, aggregateBy.get("2").intValue());
+        assertEquals(1, aggregateBy.get("1").intValue());
+
+        MapIterable<String, AtomicInteger> aggregateInPlaceBy = iterable.aggregateInPlaceBy(
+                String::valueOf,
+                AtomicInteger::new,
+                AtomicInteger::addAndGet);
+        assertEquals(4, aggregateInPlaceBy.get("4").intValue());
+        assertEquals(3, aggregateInPlaceBy.get("3").intValue());
+        assertEquals(2, aggregateInPlaceBy.get("2").intValue());
+        assertEquals(1, aggregateInPlaceBy.get("1").intValue());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_sumOfPrimitive()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        Assert.assertEquals(10.0f, iterable.sumOfFloat(Integer::floatValue), 0.001);
+        Assert.assertEquals(10.0, iterable.sumOfDouble(Integer::doubleValue), 0.001);
+        Assert.assertEquals(10, iterable.sumOfInt(integer -> integer));
+        Assert.assertEquals(10L, iterable.sumOfLong(Integer::longValue));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_injectInto()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+        assertEquals(Integer.valueOf(11), iterable.injectInto(1, new Function2<Integer, Integer, Integer>()
+        {
+            private static final long serialVersionUID = 1L;
+
+            public Integer value(Integer argument1, Integer argument2)
+            {
+                return argument1 + argument2;
+            }
+        }));
+        assertEquals(Integer.valueOf(10), iterable.injectInto(0, new Function2<Integer, Integer, Integer>()
+        {
+            private static final long serialVersionUID = 1L;
+
+            public Integer value(Integer argument1, Integer argument2)
+            {
+                return argument1 + argument2;
+            }
+        }));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_injectInto_primitive()
+    {
+        RichIterable<Integer> iterable = this.newWith(4, 3, 2, 1);
+
+        Assert.assertEquals(11, iterable.injectInto(1, AddFunction.INTEGER_TO_INT));
+        Assert.assertEquals(10, iterable.injectInto(0, AddFunction.INTEGER_TO_INT));
+
+        Assert.assertEquals(11L, iterable.injectInto(1, AddFunction.INTEGER_TO_LONG));
+        Assert.assertEquals(10L, iterable.injectInto(0, AddFunction.INTEGER_TO_LONG));
+
+        Assert.assertEquals(11.0d, iterable.injectInto(1, AddFunction.INTEGER_TO_DOUBLE), 0.001);
+        Assert.assertEquals(10.0d, iterable.injectInto(0, AddFunction.INTEGER_TO_DOUBLE), 0.001);
+
+        Assert.assertEquals(11.0f, iterable.injectInto(1, AddFunction.INTEGER_TO_FLOAT), 0.001f);
+        Assert.assertEquals(10.0f, iterable.injectInto(0, AddFunction.INTEGER_TO_FLOAT), 0.001f);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableWithDuplicatesTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableWithDuplicatesTestCase.java
new file mode 100644
index 000000000..35230f6da
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/RichIterableWithDuplicatesTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import org.junit.Test;
+
+public interface RichIterableWithDuplicatesTestCase extends RichIterableTestCase
+{
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return true;
+    }
+
+    @Test
+    default void Iterable_sanity_check()
+    {
+        String s = "";
+        Iterable<String> oneCopy = this.newWith(s);
+        Iterable<String> twoCopies = this.newWith(s, s);
+        IterableTestCase.assertEquals(!this.allowsDuplicates(), twoCopies.equals(oneCopy));
+    }
+
+    @Test
+    default void RichIterable_size()
+    {
+        IterableTestCase.assertEquals(6, this.newWith(3, 3, 3, 2, 2, 1).size());
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/SortedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/SortedIterableTestCase.java
new file mode 100644
index 000000000..8484afe64
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/SortedIterableTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Comparator;
+
+import com.gs.collections.api.ordered.SortedIterable;
+import com.gs.collections.impl.block.factory.Comparators;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static org.junit.Assert.assertSame;
+
+public interface SortedIterableTestCase extends OrderedIterableTestCase
+{
+    @Override
+    <T> SortedIterable<T> newWith(T... elements);
+
+    @Test
+    default void SortedIterable_comparator()
+    {
+        SortedIterable<Object> objects = this.newWith();
+        Comparator<? super Object> comparator = objects.comparator();
+        assertSame(Comparators.reverseNaturalOrder(), comparator);
+    }
+
+    @Override
+    default void RichIterable_min_non_comparable()
+    {
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object()));
+    }
+
+    @Override
+    default void RichIterable_max_non_comparable()
+    {
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object()));
+    }
+
+    @Override
+    default void RichIterable_min_comparator_non_comparable()
+    {
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object()));
+    }
+
+    @Override
+    default void RichIterable_max_comparator_non_comparable()
+    {
+        assertThrows(ClassCastException.class, () -> this.newWith(new Object()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableCollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableCollectionTestCase.java
new file mode 100644
index 000000000..5341d50d0
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableCollectionTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import org.junit.Test;
+
+public interface UnmodifiableCollectionTestCase extends CollectionTestCase, UnmodifiableIterableTestCase
+{
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void Collection_add()
+    {
+        this.newWith(1, 2, 3).add(4);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void Collection_clear()
+    {
+        this.newWith(1, 2, 3).clear();
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableIterableTestCase.super.Iterable_remove();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableIterableTestCase.java
new file mode 100644
index 000000000..3b6f30153
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableIterableTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+
+public interface UnmodifiableIterableTestCase extends IterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        Iterable<Integer> collection = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = collection.iterator();
+        iterator.next();
+        assertThrows(UnsupportedOperationException.class, iterator::remove);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableMutableCollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableMutableCollectionTestCase.java
new file mode 100644
index 000000000..e31f08dbf
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/UnmodifiableMutableCollectionTestCase.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import com.gs.collections.api.block.predicate.Predicate;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.collection.mutable.MutableCollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface UnmodifiableMutableCollectionTestCase extends UnmodifiableCollectionTestCase, MutableCollectionTestCase
+{
+    @Test
+    @Override
+    default void Iterable_remove()
+    {
+        UnmodifiableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test
+    default void MutableCollection_sanity_check()
+    {
+        // Cannot call add()
+
+        String s = "";
+        if (this.allowsDuplicates())
+        {
+            assertEquals(2, this.newWith(s, s).size());
+        }
+        else
+        {
+            assertThrows(IllegalStateException.class, () -> this.newWith(s, s));
+        }
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIf()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 4, 3, 2, 1);
+        collection.removeIf((Predicate<? super Integer>) each -> each % 2 == 0);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIfWith()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 4, 3, 2, 1);
+        collection.removeIfWith(Predicates2.<Integer>in(), Lists.immutable.with(5, 3, 1));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/UnorderedIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/UnorderedIterableTestCase.java
new file mode 100644
index 000000000..224666e67
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/UnorderedIterableTestCase.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.collections.impl.block.factory.Predicates;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.factory.Bags;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+
+public interface UnorderedIterableTestCase extends RichIterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        Iterator<Integer> iterator = iterable.iterator();
+        while (iterator.hasNext())
+        {
+            Integer integer = iterator.next();
+            mutableCollection.add(integer);
+        }
+
+        IterableTestCase.assertEquals(this.getExpectedFiltered(3, 3, 3, 2, 2, 1), mutableCollection);
+        assertFalse(iterator.hasNext());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getFirst()
+    {
+        RichIterable<Integer> integers = this.newWith(3, 2, 1);
+        Integer first = integers.getFirst();
+        assertThat(first, isOneOf(3, 2, 1));
+        IterableTestCase.assertEquals(integers.iterator().next(), first);
+
+        assertNotEquals(integers.getLast(), first);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getLast()
+    {
+        RichIterable<Integer> integers = this.newWith(3, 2, 1);
+        Integer last = integers.getLast();
+        assertThat(last, isOneOf(3, 2, 1));
+
+        Iterator<Integer> iterator = integers.iterator();
+        Integer iteratorLast = null;
+        while (iterator.hasNext())
+        {
+            iteratorLast = iterator.next();
+        }
+        IterableTestCase.assertEquals(iteratorLast, last);
+
+        assertNotEquals(integers.getFirst(), last);
+    }
+
+    @Test
+    default void RichIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 3, 3, 2, 2, 1).toArray();
+        IterableTestCase.assertEquals(Bags.immutable.with(3, 3, 3, 2, 2, 1), HashBag.newBagWith(array));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_detect()
+    {
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(0)), isOneOf(3, 2, 1));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(1)), isOneOf(3, 2));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(2)), is(3));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.greaterThan(3)), nullValue());
+
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(1)), nullValue());
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(2)), is(1));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(3)), isOneOf(2, 1));
+        assertThat(this.newWith(3, 2, 1).detect(Predicates.lessThan(4)), isOneOf(3, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_detectWith()
+    {
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 0), isOneOf(3, 2, 1));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 1), isOneOf(3, 2));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 2), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.greaterThan(), 3), nullValue());
+
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 1), nullValue());
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 2), is(1));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 3), isOneOf(2, 1));
+        assertThat(this.newWith(3, 2, 1).detectWith(Predicates2.lessThan(), 4), isOneOf(3, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_detectIfNone()
+    {
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(0), () -> 4), isOneOf(3, 2, 1));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(1), () -> 4), isOneOf(3, 2));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(2), () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.greaterThan(3), () -> 4), is(4));
+
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(1), () -> 4), is(4));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(2), () -> 4), is(1));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(3), () -> 4), isOneOf(2, 1));
+        assertThat(this.newWith(3, 2, 1).detectIfNone(Predicates.lessThan(4), () -> 4), isOneOf(3, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_detectWithIfNone()
+    {
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 0, () -> 4), isOneOf(3, 2, 1));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 1, () -> 4), isOneOf(3, 2));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 2, () -> 4), is(3));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.greaterThan(), 3, () -> 4), is(4));
+
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 1, () -> 4), is(4));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 2, () -> 4), is(1));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 3, () -> 4), isOneOf(2, 1));
+        assertThat(this.newWith(3, 2, 1).detectWithIfNone(Predicates2.lessThan(), 4, () -> 4), isOneOf(3, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_minBy()
+    {
+        // Without an ordering, min can be either ca or da
+        RichIterable<String> iterable = this.newWith("ed", "da", "ca", "bc", "ab");
+        String actualMin = iterable.minBy(string -> string.charAt(string.length() - 1));
+        assertThat(actualMin, isOneOf("ca", "da"));
+        IterableTestCase.assertEquals(iterable.detect(each -> each.equals("ca") || each.equals("da")), actualMin);
+
+        assertThrows(NoSuchElementException.class, () -> this.<String>newWith().minBy(string -> string.charAt(string.length() - 1)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_maxBy()
+    {
+        // Without an ordering, max can be either ca or da
+        RichIterable<String> iterable = this.newWith("ew", "dz", "cz", "bx", "ay");
+        String actualMax = iterable.maxBy(string -> string.charAt(string.length() - 1));
+        assertThat(actualMax, isOneOf("cz", "dz"));
+        IterableTestCase.assertEquals(iterable.detect(each -> each.equals("cz") || each.equals("dz")), actualMax);
+
+        assertThrows(NoSuchElementException.class, () -> this.<String>newWith().maxBy(string -> string.charAt(string.length() - 1)));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/BagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/BagTestCase.java
new file mode 100644
index 000000000..9509d811f
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/BagTestCase.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.bag.Bag;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.test.RichIterableWithDuplicatesTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface BagTestCase extends RichIterableWithDuplicatesTestCase
+{
+    @Override
+    <T> Bag<T> newWith(T... elements);
+
+    @Override
+    default MutableCollection<Integer> expectedIterationOrder()
+    {
+        MutableCollection<Integer> forEach = this.newMutableForFilter();
+        Bag<Integer> bag = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        bag.forEachWithOccurrences((Integer each, int parameter) -> forEach.add(each));
+        return forEach;
+    }
+
+    @Override
+    default void RichIterable_iterator_iterationOrder()
+    {
+        MutableCollection<Integer> iterationOrder = this.newMutableForFilter();
+        Iterator<Integer> iterator = this.getInstanceUnderTest().iterator();
+        while (iterator.hasNext())
+        {
+            iterationOrder.add(iterator.next());
+        }
+        assertEquals(RichIterableWithDuplicatesTestCase.super.expectedIterationOrder(), iterationOrder);
+
+        MutableCollection<Integer> forEachWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().forEachWith((each, param) -> forEachWithIterationOrder.add(each), null);
+        assertEquals(RichIterableWithDuplicatesTestCase.super.expectedIterationOrder(), forEachWithIterationOrder);
+
+        MutableCollection<Integer> forEachWithIndexIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().forEachWithIndex((each, index) -> forEachWithIndexIterationOrder.add(each));
+        assertEquals(RichIterableWithDuplicatesTestCase.super.expectedIterationOrder(), forEachWithIndexIterationOrder);
+    }
+
+    @Test
+    default void Bag_sizeDistinct()
+    {
+        Bag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertEquals(3, bag.sizeDistinct());
+    }
+
+    @Test
+    default void Bag_occurrencesOf()
+    {
+        Bag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertEquals(0, bag.occurrencesOf(0));
+        assertEquals(1, bag.occurrencesOf(1));
+        assertEquals(2, bag.occurrencesOf(2));
+        assertEquals(3, bag.occurrencesOf(3));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/TransformsToBagTrait.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/TransformsToBagTrait.java
new file mode 100644
index 000000000..6ff2ba451
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/TransformsToBagTrait.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.api.bag.UnsortedBag;
+import com.gs.collections.api.bag.primitive.MutableBooleanBag;
+import com.gs.collections.api.bag.primitive.MutableByteBag;
+import com.gs.collections.api.bag.primitive.MutableCharBag;
+import com.gs.collections.api.bag.primitive.MutableDoubleBag;
+import com.gs.collections.api.bag.primitive.MutableFloatBag;
+import com.gs.collections.api.bag.primitive.MutableIntBag;
+import com.gs.collections.api.bag.primitive.MutableLongBag;
+import com.gs.collections.api.bag.primitive.MutableShortBag;
+import com.gs.collections.impl.bag.mutable.primitive.BooleanHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.ByteHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.CharHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.DoubleHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.FloatHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.IntHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.LongHashBag;
+import com.gs.collections.impl.bag.mutable.primitive.ShortHashBag;
+import com.gs.collections.impl.factory.Bags;
+import com.gs.collections.test.RichIterableTestCase;
+
+public interface TransformsToBagTrait extends RichIterableTestCase
+{
+    @Override
+    default <T> UnsortedBag<T> getExpectedTransformed(T... elements)
+    {
+        return Bags.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableBag<T> newMutableForTransform(T... elements)
+    {
+        return Bags.mutable.with(elements);
+    }
+
+    @Override
+    default MutableBooleanBag newBooleanForTransform(boolean... elements)
+    {
+        return new BooleanHashBag(elements);
+    }
+
+    @Override
+    default MutableByteBag newByteForTransform(byte... elements)
+    {
+        return new ByteHashBag(elements);
+    }
+
+    @Override
+    default MutableCharBag newCharForTransform(char... elements)
+    {
+        return new CharHashBag(elements);
+    }
+
+    @Override
+    default MutableDoubleBag newDoubleForTransform(double... elements)
+    {
+        return new DoubleHashBag(elements);
+    }
+
+    @Override
+    default MutableFloatBag newFloatForTransform(float... elements)
+    {
+        return new FloatHashBag(elements);
+    }
+
+    @Override
+    default MutableIntBag newIntForTransform(int... elements)
+    {
+        return new IntHashBag(elements);
+    }
+
+    @Override
+    default MutableLongBag newLongForTransform(long... elements)
+    {
+        return new LongHashBag(elements);
+    }
+
+    @Override
+    default MutableShortBag newShortForTransform(short... elements)
+    {
+        return new ShortHashBag(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/UnsortedBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/UnsortedBagTestCase.java
new file mode 100644
index 000000000..44402e718
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/UnsortedBagTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.api.bag.UnsortedBag;
+import com.gs.collections.impl.factory.Bags;
+import com.gs.collections.test.UnorderedIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertSame;
+
+public interface UnsortedBagTestCase extends UnorderedIterableTestCase, BagTestCase, TransformsToBagTrait
+{
+    @Override
+    <T> UnsortedBag<T> newWith(T... elements);
+
+    @Override
+    default <T> UnsortedBag<T> getExpectedFiltered(T... elements)
+    {
+        return Bags.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableBag<T> newMutableForFilter(T... elements)
+    {
+        return Bags.mutable.with(elements);
+    }
+
+    @Test
+    default void UnsortedBag_forEachWith()
+    {
+        UnsortedBag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableBag<Integer> result = Bags.mutable.with();
+        Object sentinel = new Object();
+        bag.forEachWith((argument1, argument2) -> {
+            result.add(argument1);
+            assertSame(sentinel, argument2);
+        }, sentinel);
+        assertEquals(Bags.immutable.with(3, 3, 3, 2, 2, 1), result);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTest.java
new file mode 100644
index 000000000..b8ab5f1f2
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.immutable;
+
+import com.gs.collections.api.bag.ImmutableBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableBagTest implements ImmutableBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableBag<T> newWith(T... elements)
+    {
+        return HashBag.newBagWith(elements).toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTestCase.java
new file mode 100644
index 000000000..e6f6abefe
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableBagTestCase.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.immutable;
+
+import com.gs.collections.api.bag.ImmutableBag;
+import com.gs.collections.test.bag.UnsortedBagTestCase;
+import com.gs.collections.test.collection.immutable.ImmutableCollectionTestCase;
+import org.junit.Test;
+
+public interface ImmutableBagTestCase extends ImmutableCollectionTestCase, UnsortedBagTestCase
+{
+    @Override
+    <T> ImmutableBag<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        ImmutableCollectionTestCase.super.Iterable_remove();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableHashBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableHashBagTest.java
new file mode 100644
index 000000000..a5bb64fb8
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/immutable/ImmutableHashBagTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.immutable;
+
+import com.gs.collections.api.bag.ImmutableBag;
+import com.gs.collections.impl.bag.immutable.ImmutableHashBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableHashBagTest implements ImmutableBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableBag<T> newWith(T... elements)
+    {
+        return new ImmutableHashBag<>(HashBag.newBagWith(elements));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagNoIteratorTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagNoIteratorTest.java
new file mode 100644
index 000000000..552219171
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagNoIteratorTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.NoIteratorTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class HashBagNoIteratorTest implements MutableBagTestCase, NoIteratorTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableBag<T> newWith(T... elements)
+    {
+        MutableBag<T> result = new HashBagNoIterator<>();
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+
+    @Override
+    public void Iterable_next()
+    {
+        NoIteratorTestCase.super.Iterable_next();
+    }
+
+    @Override
+    public void Iterable_remove()
+    {
+        NoIteratorTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    public void RichIterable_iterator_iterationOrder()
+    {
+        NoIteratorTestCase.super.RichIterable_iterator_iterationOrder();
+    }
+
+    @Override
+    public void RichIterable_getFirst()
+    {
+        NoIteratorTestCase.super.RichIterable_getFirst();
+    }
+
+    @Override
+    public void RichIterable_getLast()
+    {
+        NoIteratorTestCase.super.RichIterable_getLast();
+    }
+
+    public static class HashBagNoIterator<T> extends HashBag<T>
+    {
+        @Override
+        public Iterator<T> iterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to iterator()");
+        }
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagTest.java
new file mode 100644
index 000000000..f2dd0efbe
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/HashBagTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class HashBagTest implements MutableBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableBag<T> newWith(T... elements)
+    {
+        return HashBag.newBagWith(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MultiReaderHashBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MultiReaderHashBagTest.java
new file mode 100644
index 000000000..ff7597865
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MultiReaderHashBagTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.bag.mutable.MultiReaderHashBag;
+import com.gs.collections.impl.block.factory.Procedures;
+import com.gs.collections.test.collection.mutable.MultiReaderMutableCollectionTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Java8Runner.class)
+public class MultiReaderHashBagTest implements MutableBagTestCase, MultiReaderMutableCollectionTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MultiReaderHashBag<T> newWith(T... elements)
+    {
+        return MultiReaderHashBag.newBagWith(elements);
+    }
+
+    @Test
+    @Override
+    public void Iterable_remove()
+    {
+        MultiReaderMutableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Test
+    @Override
+    public void Iterable_next()
+    {
+        MultiReaderMutableCollectionTestCase.super.Iterable_next();
+    }
+
+    @Override
+    public void RichIterable_getFirst()
+    {
+        MultiReaderMutableCollectionTestCase.super.RichIterable_getFirst();
+    }
+
+    @Override
+    public void RichIterable_getLast()
+    {
+        MultiReaderMutableCollectionTestCase.super.RichIterable_getLast();
+    }
+
+    @Override
+    @Test
+    public void RichIterable_iterator_iterationOrder()
+    {
+        MutableCollection<Integer> iterationOrder = this.newMutableForFilter();
+        MultiReaderHashBag<Integer> instanceUnderTest = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+
+        MutableCollection<Integer> expectedIterationOrder = this.newMutableForFilter();
+        instanceUnderTest.forEach(Procedures.cast(expectedIterationOrder::add));
+
+        instanceUnderTest.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                iterationOrder.add(iterator.next());
+            }
+        });
+
+        // TODO Report to JetBrains
+        // assertEquals(MultiReaderMutableCollectionTestCase.super.expectedIterationOrder(), iterationOrder);
+        assertEquals(expectedIterationOrder, iterationOrder);
+    }
+
+    @Test
+    public void MultiReaderHashBag_next()
+    {
+        MultiReaderHashBag<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                Integer integer = iterator.next();
+                mutableCollection.add(integer);
+            }
+
+            assertEquals(this.getExpectedFiltered(3, 3, 3, 2, 2, 1), mutableCollection);
+            assertFalse(iterator.hasNext());
+        });
+    }
+
+    @Test
+    public void MultiReaderHashBag_hasNext()
+    {
+        MultiReaderHashBag<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> assertTrue(delegate.iterator().hasNext()));
+        MultiReaderHashBag<?> emptyIterable = this.newWith();
+        emptyIterable.withReadLockAndDelegate(delegate -> assertFalse(delegate.iterator().hasNext()));
+    }
+
+    @Test
+    public void MultiReaderHashBag_next_throws_at_end()
+    {
+        MultiReaderHashBag<Integer> iterable = this.newWith(3, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertFalse(iterator.hasNext());
+            assertThrows(NoSuchElementException.class, (Runnable) iterator::next);
+        });
+    }
+
+    @Test
+    public void MultiReaderHashBag_next_throws_on_empty()
+    {
+        MultiReaderHashBag<Object> iterable = this.newWith();
+        assertThrows(
+                NoSuchElementException.class,
+                () -> iterable.withReadLockAndDelegate(delegate -> delegate.iterator().next()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MutableBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MutableBagTestCase.java
new file mode 100644
index 000000000..7e90bce95
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/MutableBagTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.impl.factory.Bags;
+import com.gs.collections.test.MutableUnorderedIterableTestCase;
+import com.gs.collections.test.bag.UnsortedBagTestCase;
+import com.gs.collections.test.collection.mutable.MutableCollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public interface MutableBagTestCase extends UnsortedBagTestCase, MutableCollectionTestCase, MutableUnorderedIterableTestCase
+{
+    @Override
+    <T> MutableBag<T> newWith(T... elements);
+
+    @Test
+    default void MutableBag_addOccurrences()
+    {
+        MutableBag<Integer> mutableBag = this.newWith(1, 2, 2, 3, 3, 3);
+        mutableBag.addOccurrences(4, 4);
+        assertEquals(Bags.immutable.with(1, 2, 2, 3, 3, 3, 4, 4, 4, 4), mutableBag);
+        mutableBag.addOccurrences(1, 2);
+        assertEquals(Bags.immutable.with(1, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4), mutableBag);
+    }
+
+    @Test
+    default void MutableBag_removeOccurrences()
+    {
+        MutableBag<Integer> mutableBag = this.newWith(1, 2, 2, 3, 3, 3);
+        assertFalse(mutableBag.removeOccurrences(4, 4));
+        assertEquals(Bags.immutable.with(1, 2, 2, 3, 3, 3), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(1, 2));
+        assertEquals(Bags.immutable.with(2, 2, 3, 3, 3), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(3, 2));
+        assertEquals(Bags.immutable.with(2, 2, 3), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(2, 1));
+        assertEquals(Bags.immutable.with(2, 3), mutableBag);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/SynchronizedMutableBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/SynchronizedMutableBagTest.java
new file mode 100644
index 000000000..01f9c0da2
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/SynchronizedMutableBagTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SynchronizedMutableBagTest implements MutableBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableBag<T> newWith(T... elements)
+    {
+        return HashBag.newBagWith(elements).asSynchronized();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTest.java
new file mode 100644
index 000000000..23a0d7d8f
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnmodifiableBagTest implements UnmodifiableBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableBag<T> newWith(T... elements)
+    {
+        return HashBag.newBagWith(elements).asUnmodifiable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTestCase.java
new file mode 100644
index 000000000..d375c160f
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/UnmodifiableBagTestCase.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.test.UnmodifiableMutableCollectionTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableBagTestCase extends UnmodifiableMutableCollectionTestCase, MutableBagTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableMutableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableBag_addOccurrences()
+    {
+        MutableBag<Integer> mutableBag = this.newWith(1, 2, 2, 3, 3, 3);
+        mutableBag.addOccurrences(4, 4);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableBag_removeOccurrences()
+    {
+        MutableBag<Integer> mutableBag = this.newWith(1, 2, 2, 3, 3, 3);
+        mutableBag.removeOccurrences(4, 4);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/MutableSortedBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/MutableSortedBagTestCase.java
new file mode 100644
index 000000000..4234d65f0
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/MutableSortedBagTestCase.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable.sorted;
+
+import com.gs.collections.api.bag.sorted.MutableSortedBag;
+import com.gs.collections.impl.bag.sorted.mutable.TreeBag;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.test.MutableOrderedIterableTestCase;
+import com.gs.collections.test.collection.mutable.MutableCollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public interface MutableSortedBagTestCase extends SortedBagTestCase, MutableCollectionTestCase, MutableOrderedIterableTestCase
+{
+    @Override
+    <T> MutableSortedBag<T> newWith(T... elements);
+
+    @Test
+    default void MutableBag_addOccurrences()
+    {
+        MutableSortedBag<Integer> mutableSortedBag = this.newWith(3, 3, 3, 2, 2, 1);
+        mutableSortedBag.addOccurrences(4, 4);
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 4, 4, 4, 4, 3, 3, 3, 2, 2, 1), mutableSortedBag);
+        mutableSortedBag.addOccurrences(1, 2);
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1), mutableSortedBag);
+        mutableSortedBag.addOccurrences(1, 0);
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 1), mutableSortedBag);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    default void MutableBag_addOccurrences_throws()
+    {
+        MutableSortedBag<Integer> mutableSortedBag = this.newWith(3, 3, 3, 2, 2, 1);
+        mutableSortedBag.addOccurrences(4, -1);
+    }
+
+    @Test
+    default void MutableBag_removeOccurrences()
+    {
+        MutableSortedBag<Integer> mutableBag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertFalse(mutableBag.removeOccurrences(4, 4));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3, 3, 3, 2, 2, 1), mutableBag);
+        assertFalse(mutableBag.removeOccurrences(3, 0));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3, 3, 3, 2, 2, 1), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(1, 2));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3, 3, 3, 2, 2), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(3, 2));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3, 2, 2), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(2, 1));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3, 2), mutableBag);
+        assertTrue(mutableBag.removeOccurrences(2, 2));
+        assertEquals(TreeBag.newBagWith(Comparators.reverseNaturalOrder(), 3), mutableBag);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    default void MutableBag_removeOccurrences_throws()
+    {
+        MutableSortedBag<Integer> mutableBag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertFalse(mutableBag.removeOccurrences(4, -1));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/OrderedIterableNoIteratorTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/OrderedIterableNoIteratorTest.java
new file mode 100644
index 000000000..31889bee3
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/OrderedIterableNoIteratorTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable.sorted;
+
+import com.gs.collections.test.NoIteratorTestCase;
+import com.gs.collections.test.OrderedIterableTestCase;
+
+public interface OrderedIterableNoIteratorTest extends NoIteratorTestCase, OrderedIterableTestCase
+{
+    @Override
+    default void OrderedIterable_next()
+    {
+        // Not applicable
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/SortedBagTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/SortedBagTestCase.java
new file mode 100644
index 000000000..34093c6df
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/SortedBagTestCase.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable.sorted;
+
+import com.gs.collections.api.bag.sorted.MutableSortedBag;
+import com.gs.collections.api.bag.sorted.SortedBag;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.bag.sorted.mutable.TreeBag;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.SortedIterableTestCase;
+import com.gs.collections.test.bag.BagTestCase;
+import com.gs.collections.test.domain.A;
+import com.gs.collections.test.domain.B;
+import com.gs.collections.test.domain.C;
+import com.gs.collections.test.list.TransformsToListTrait;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+// TODO linked bag
+public interface SortedBagTestCase extends SortedIterableTestCase, BagTestCase, TransformsToListTrait
+{
+    @Override
+    <T> SortedBag<T> newWith(T... elements);
+
+    @Override
+    default <T> SortedBag<T> getExpectedFiltered(T... elements)
+    {
+        return new TreeBag<>(Comparators.reverseNaturalOrder(), Lists.immutable.with(elements));
+    }
+
+    @Override
+    default <T> MutableSortedBag<T> newMutableForFilter(T... elements)
+    {
+        return new TreeBag<>(Comparators.reverseNaturalOrder(), Lists.immutable.with(elements));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_selectInstancesOf()
+    {
+        // Must test with two classes that are mutually Comparable
+
+        SortedBag<A> numbers = this.<A>newWith(
+                new C(4.0), new C(4.0), new C(4.0), new C(4.0),
+                new B(3), new B(3), new B(3),
+                new C(2.0), new C(2.0),
+                new B(1));
+        assertEquals(
+                this.<B>getExpectedFiltered(new B(3), new B(3), new B(3), new B(1)),
+                numbers.selectInstancesOf(B.class));
+        assertEquals(
+                this.getExpectedFiltered(
+                        new C(4.0), new C(4.0), new C(4.0), new C(4.0),
+                        new B(3), new B(3), new B(3),
+                        new C(2.0), new C(2.0),
+                        new B(1)),
+                numbers.selectInstancesOf(A.class));
+    }
+
+    @Override
+    @Test
+    default void Bag_sizeDistinct()
+    {
+        SortedBag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertEquals(3, bag.sizeDistinct());
+    }
+
+    @Override
+    @Test
+    default void Bag_occurrencesOf()
+    {
+        SortedBag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        assertEquals(0, bag.occurrencesOf(0));
+        assertEquals(1, bag.occurrencesOf(1));
+        assertEquals(2, bag.occurrencesOf(2));
+        assertEquals(3, bag.occurrencesOf(3));
+    }
+
+    @Test
+    default void SortedBag_forEachWith()
+    {
+        SortedBag<Integer> bag = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableList<Integer> result = Lists.mutable.with();
+        bag.forEachWith((argument1, argument2) -> {
+            result.add(argument1);
+            result.add(argument2);
+        }, 0);
+        assertEquals(Lists.immutable.with(3, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0), result);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagNoIteratorTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagNoIteratorTest.java
new file mode 100644
index 000000000..79c972686
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagNoIteratorTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable.sorted;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+
+import com.gs.collections.api.bag.sorted.MutableSortedBag;
+import com.gs.collections.impl.bag.sorted.mutable.TreeBag;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class TreeBagNoIteratorTest implements MutableSortedBagTestCase, OrderedIterableNoIteratorTest
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedBag<T> newWith(T... elements)
+    {
+        return new TreeBagNoIterator<>(Comparators.reverseNaturalOrder(), Arrays.asList(elements));
+    }
+
+    @Override
+    public void Iterable_remove()
+    {
+        OrderedIterableNoIteratorTest.super.Iterable_remove();
+    }
+
+    @Override
+    public void RichIterable_iterator_iterationOrder()
+    {
+        OrderedIterableNoIteratorTest.super.RichIterable_iterator_iterationOrder();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    public void MutableCollection_toImmutable()
+    {
+        MutableSortedBagTestCase.super.MutableCollection_toImmutable();
+    }
+
+    public static class TreeBagNoIterator<T> extends TreeBag<T>
+    {
+        public TreeBagNoIterator()
+        {
+            // For serialization
+        }
+
+        public TreeBagNoIterator(Comparator<? super T> comparator, Iterable<? extends T> iterable)
+        {
+            super(comparator, iterable);
+        }
+
+        @Override
+        public Iterator<T> iterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to iterator()");
+        }
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagTest.java
new file mode 100644
index 000000000..93f504ef7
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bag/mutable/sorted/TreeBagTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bag.mutable.sorted;
+
+import com.gs.collections.api.bag.sorted.MutableSortedBag;
+import com.gs.collections.impl.bag.sorted.mutable.TreeBag;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class TreeBagTest implements MutableSortedBagTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedBag<T> newWith(T... elements)
+    {
+        return TreeBag.newBagWith(Comparators.reverseNaturalOrder(), elements);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    public void MutableCollection_toImmutable()
+    {
+        MutableSortedBagTestCase.super.MutableCollection_toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/BiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/BiMapTestCase.java
new file mode 100644
index 000000000..9ff1f4b07
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/BiMapTestCase.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap;
+
+import com.gs.collections.api.bimap.BiMap;
+import com.gs.collections.test.RichIterableUniqueTestCase;
+
+public interface BiMapTestCase extends RichIterableUniqueTestCase
+{
+    @Override
+    <T> BiMap<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/UnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/UnsortedBiMapTestCase.java
new file mode 100644
index 000000000..863adb705
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/UnsortedBiMapTestCase.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.bimap.BiMap;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.api.set.UnsortedSetIterable;
+import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.test.bag.TransformsToBagTrait;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+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 UnsortedBiMapTestCase extends BiMapTestCase, TransformsToBagTrait
+{
+    @Override
+    <T> BiMap<Object, T> newWith(T... elements);
+
+    @Override
+    default <T> UnsortedSetIterable<T> getExpectedFiltered(T... elements)
+    {
+        return Sets.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableSet<T> newMutableForFilter(T... elements)
+    {
+        return Sets.mutable.with(elements);
+    }
+
+    // TODO pull up
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        Iterator<Integer> iterator = iterable.iterator();
+        while (iterator.hasNext())
+        {
+            Integer integer = iterator.next();
+            mutableCollection.add(integer);
+        }
+
+        assertEquals(this.getExpectedFiltered(3, 2, 1), mutableCollection);
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    @Override
+    default void Iterable_remove()
+    {
+        BiMap<Object, Integer> iterable = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        iterator.next();
+        iterator.remove();
+        assertEquals(2, iterable.size());
+        MutableSet<Integer> valuesSet = iterable.inverse().keysView().toSet();
+        assertThat(
+                valuesSet,
+                isOneOf(
+                        Sets.immutable.with(3, 2),
+                        Sets.immutable.with(3, 1),
+                        Sets.immutable.with(2, 1)));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 2, 1).toArray();
+        assertThat(array, anyOf(
+                equalTo(new Object[]{1, 2, 3}),
+                equalTo(new Object[]{1, 3, 2}),
+                equalTo(new Object[]{2, 1, 3}),
+                equalTo(new Object[]{2, 3, 1}),
+                equalTo(new Object[]{3, 1, 2}),
+                equalTo(new Object[]{3, 2, 1})));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableBiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableBiMapTestCase.java
new file mode 100644
index 000000000..acadd621a
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableBiMapTestCase.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.immutable;
+
+import com.gs.collections.api.bimap.ImmutableBiMap;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+
+public interface ImmutableBiMapTestCase extends ImmutableUnsortedBiMapTestCase
+{
+    @Override
+    <T> ImmutableBiMap<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java
new file mode 100644
index 000000000..0a962ac10
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapInverseTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.immutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.bimap.ImmutableBiMap;
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.impl.bimap.mutable.HashBiMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableHashBiMapInverseTest implements ImmutableBiMapTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public <T> ImmutableBiMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+        MutableBiMap<T, Object> result = new HashBiMap<>();
+        for (T each : elements)
+        {
+            if (result.put(each, random.nextDouble()) != null)
+            {
+                throw new IllegalStateException();
+            }
+        }
+        return result.toImmutable().inverse();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapTest.java
new file mode 100644
index 000000000..b6b574a36
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableHashBiMapTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.immutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.bimap.ImmutableBiMap;
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.impl.bimap.mutable.HashBiMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+
+@RunWith(Java8Runner.class)
+public class ImmutableHashBiMapTest implements ImmutableBiMapTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public <T> ImmutableBiMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+        MutableBiMap<Object, T> result = new HashBiMap<>();
+        for (T each : elements)
+        {
+            try
+            {
+                result.put(random.nextDouble(), each);
+            }
+            catch (IllegalArgumentException e)
+            {
+                throw new IllegalStateException(e);
+            }
+        }
+        return result.toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java
new file mode 100644
index 000000000..f791b571c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/immutable/ImmutableUnsortedBiMapTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.immutable;
+
+import com.gs.collections.api.bimap.ImmutableBiMap;
+import com.gs.collections.test.ImmutableUnorderedIterableTestCase;
+import com.gs.collections.test.bimap.UnsortedBiMapTestCase;
+
+public interface ImmutableUnsortedBiMapTestCase extends UnsortedBiMapTestCase, ImmutableUnorderedIterableTestCase
+{
+    @Override
+    <T> ImmutableBiMap<Object, T> newWith(T... elements);
+
+    @Override
+    default void Iterable_remove()
+    {
+        ImmutableUnorderedIterableTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    default void Iterable_next()
+    {
+        UnsortedBiMapTestCase.super.Iterable_next();
+    }
+
+    @Override
+    default void RichIterable_toArray()
+    {
+        UnsortedBiMapTestCase.super.RichIterable_toArray();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapInverseTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapInverseTest.java
new file mode 100644
index 000000000..197ce63ca
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapInverseTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.mutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.impl.bimap.mutable.HashBiMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class HashBiMapInverseTest implements MutableBiMapTestCase
+{
+    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<T, Object> result = new HashBiMap<>();
+        for (T each : elements)
+        {
+            if (result.put(each, random.nextDouble()) != null)
+            {
+                throw new IllegalStateException();
+            }
+        }
+        return result.inverse();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapTest.java
new file mode 100644
index 000000000..7c64815a9
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/HashBiMapTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.mutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.impl.bimap.mutable.HashBiMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class HashBiMapTest implements MutableBiMapTestCase
+{
+    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 HashBiMap<>();
+        for (T each : elements)
+        {
+            try
+            {
+                result.put(random.nextDouble(), each);
+            }
+            catch (IllegalArgumentException e)
+            {
+                throw new IllegalStateException(e);
+            }
+        }
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableBiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableBiMapTestCase.java
new file mode 100644
index 000000000..c1679530d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableBiMapTestCase.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.mutable;
+
+import com.gs.collections.api.bimap.MutableBiMap;
+
+public interface MutableBiMapTestCase extends MutableUnsortedBiMapTestCase
+{
+    @Override
+    <T> MutableBiMap<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java
new file mode 100644
index 000000000..2945ddb34
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/bimap/mutable/MutableUnsortedBiMapTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.bimap.mutable;
+
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.test.MutableUnorderedIterableTestCase;
+import com.gs.collections.test.bimap.UnsortedBiMapTestCase;
+
+public interface MutableUnsortedBiMapTestCase extends UnsortedBiMapTestCase, MutableUnorderedIterableTestCase
+{
+    @Override
+    <T> MutableBiMap<Object, T> newWith(T... elements);
+
+    @Override
+    default void Iterable_remove()
+    {
+        UnsortedBiMapTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    default void Iterable_next()
+    {
+        UnsortedBiMapTestCase.super.Iterable_next();
+    }
+
+    @Override
+    default void RichIterable_toArray()
+    {
+        UnsortedBiMapTestCase.super.RichIterable_toArray();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionTestCase.java
new file mode 100644
index 000000000..4a74ed1fd
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionTestCase.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.collection.immutable;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.collection.ImmutableCollection;
+import com.gs.collections.test.RichIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+
+public interface ImmutableCollectionTestCase extends RichIterableTestCase
+{
+    @Override
+    <T> ImmutableCollection<T> newWith(T... elements);
+
+    @Test
+    default void ImmutableCollection_sanity_check()
+    {
+        String s = "";
+        if (this.allowsDuplicates())
+        {
+            assertEquals(2, this.newWith(s, s).size());
+        }
+        else
+        {
+            assertThrows(IllegalStateException.class, () -> this.newWith(s, s));
+        }
+
+        ImmutableCollection<String> collection = this.newWith(s);
+        ImmutableCollection<String> newCollection = collection.newWith(s);
+        if (this.allowsDuplicates())
+        {
+            assertEquals(2, newCollection.size());
+            assertEquals(this.newWith(s, s), newCollection);
+        }
+        else
+        {
+            assertEquals(1, newCollection.size());
+            assertSame(collection, newCollection);
+        }
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        ImmutableCollection<Integer> collection = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = collection.iterator();
+        iterator.next();
+        assertThrows(UnsupportedOperationException.class, iterator::remove);
+    }
+
+    @Test
+    default void ImmutableCollection_newWith()
+    {
+        ImmutableCollection<Integer> immutableCollection = this.newWith(3, 3, 3, 2, 2, 1);
+        ImmutableCollection<Integer> newWith = immutableCollection.newWith(4);
+
+        assertEquals(this.newWith(3, 3, 3, 2, 2, 1, 4), newWith);
+        assertNotSame(immutableCollection, newWith);
+        assertThat(newWith, instanceOf(ImmutableCollection.class));
+
+        ImmutableCollection<Integer> newWith2 = newWith.newWith(4);
+
+        assertEquals(this.newWith(3, 3, 3, 2, 2, 1, 4, 4), newWith2);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionUniqueTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionUniqueTestCase.java
new file mode 100644
index 000000000..4f9d641c5
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/immutable/ImmutableCollectionUniqueTestCase.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.collection.immutable;
+
+import com.gs.collections.test.RichIterableUniqueTestCase;
+
+public interface ImmutableCollectionUniqueTestCase extends ImmutableCollectionTestCase, RichIterableUniqueTestCase
+{
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MultiReaderMutableCollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MultiReaderMutableCollectionTestCase.java
new file mode 100644
index 000000000..a7fc48264
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MultiReaderMutableCollectionTestCase.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.collection.mutable;
+
+import com.gs.collections.impl.collection.mutable.AbstractMultiReaderMutableCollection;
+import org.junit.Test;
+
+public interface MultiReaderMutableCollectionTestCase extends MutableCollectionTestCase
+{
+    @Override
+    <T> AbstractMultiReaderMutableCollection<T> newWith(T... elements);
+
+    @Test(expected = UnsupportedOperationException.class)
+    default void Iterable_iterator_throws()
+    {
+        this.newWith(3, 2, 1).iterator();
+    }
+
+    @Test
+    @Override
+    default void Iterable_remove()
+    {
+        // Multi-reader collections don't support iterator()
+    }
+
+    @Test
+    @Override
+    default void Iterable_next()
+    {
+        // Multi-reader collections don't support iterator()
+    }
+
+    @Test
+    @Override
+    default void Iterable_hasNext()
+    {
+        // Multi-reader collections don't support iterator()
+    }
+
+    @Test
+    @Override
+    default void Iterable_next_throws_at_end()
+    {
+        // Multi-reader collections don't support iterator()
+    }
+
+    @Test
+    @Override
+    default void Iterable_next_throws_on_empty()
+    {
+        // Multi-reader collections don't support iterator()
+    }
+
+    @Test
+    @Override
+    default void RichIterable_getFirst()
+    {
+        // Does not support iterator outside withReadLockAndDelegate
+    }
+
+    @Test
+    @Override
+    default void RichIterable_getLast()
+    {
+        // Does not support iterator outside withReadLockAndDelegate
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionTestCase.java
new file mode 100644
index 000000000..7941de827
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionTestCase.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.collection.mutable;
+
+import com.gs.collections.api.block.function.Function3;
+import com.gs.collections.api.block.predicate.Predicate;
+import com.gs.collections.api.collection.ImmutableCollection;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.CollectionTestCase;
+import com.gs.collections.test.RichIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public interface MutableCollectionTestCase extends CollectionTestCase, RichIterableTestCase
+{
+    @Override
+    <T> MutableCollection<T> newWith(T... elements);
+
+    @Test
+    default void MutableCollection_iterationOrder()
+    {
+        MutableCollection<Integer> injectIntoWithIterationOrder = this.newMutableForFilter();
+        this.getInstanceUnderTest().injectIntoWith(0, new Function3<Integer, Integer, Integer, Integer>()
+        {
+            @Override
+            public Integer value(Integer argument1, Integer argument2, Integer argument3)
+            {
+                injectIntoWithIterationOrder.add(argument2);
+                return 0;
+            }
+        }, 0);
+        assertEquals(this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1), injectIntoWithIterationOrder);
+
+        // TODO removeIf and removeIfWith
+    }
+
+    // TODO try to make the return type of newWith and getInstanceUnderTest a generic parameter
+    @Override
+    default MutableCollection<Integer> getInstanceUnderTest()
+    {
+        return this.allowsDuplicates()
+                ? this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1)
+                : this.newWith(4, 3, 2, 1);
+    }
+
+    @Test
+    default void MutableCollection_sanity_check()
+    {
+        String s = "";
+
+        MutableCollection<String> collection = this.newWith();
+        assertTrue(collection.add(s));
+        assertEquals(this.allowsDuplicates(), collection.add(s));
+        assertEquals(this.allowsDuplicates() ? 2 : 1, collection.size());
+    }
+
+    @Test
+    default void MutableCollection_toImmutable()
+    {
+        assertThat(this.newWith(), instanceOf(MutableCollection.class));
+        assertThat(this.newWith().toImmutable(), instanceOf(ImmutableCollection.class));
+    }
+
+    @Test
+    default void MutableCollection_removeIf()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 5, 4, 4, 3, 3, 2, 2, 1, 1);
+        collection.removeIf((Predicate<? super Integer>) each -> each % 2 == 0);
+        assertEquals(this.getExpectedFiltered(5, 5, 3, 3, 1, 1), collection);
+    }
+
+    @Test
+    default void MutableCollection_removeIfWith()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 5, 4, 4, 3, 3, 2, 2, 1, 1);
+        collection.removeIfWith(Predicates2.<Integer>in(), Lists.immutable.with(5, 3, 1));
+        assertEquals(this.getExpectedFiltered(4, 4, 2, 2), collection);
+    }
+
+    @Test
+    default void MutableCollection_injectIntoWith()
+    {
+        MutableCollection<Integer> collection = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        assertEquals(Integer.valueOf(81), collection.injectIntoWith(1, new Function3<Integer, Integer, Integer, Integer>()
+        {
+            @Override
+            public Integer value(Integer argument1, Integer argument2, Integer argument3)
+            {
+                return argument1 + argument2 + argument3;
+            }
+        }, 5));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionUniqueTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionUniqueTestCase.java
new file mode 100644
index 000000000..b25a87a6a
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/collection/mutable/MutableCollectionUniqueTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.collection.mutable;
+
+import com.gs.collections.api.block.function.Function3;
+import com.gs.collections.api.block.predicate.Predicate;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.block.factory.Predicates2;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.RichIterableUniqueTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface MutableCollectionUniqueTestCase extends MutableCollectionTestCase, RichIterableUniqueTestCase
+{
+    @Override
+    <T> MutableCollection<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void MutableCollection_removeIf()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 4, 3, 2, 1);
+        collection.removeIf((Predicate<? super Integer>) each -> each % 2 == 0);
+        assertEquals(this.getExpectedFiltered(5, 3, 1), collection);
+    }
+
+    @Override
+    @Test
+    default void MutableCollection_removeIfWith()
+    {
+        MutableCollection<Integer> collection = this.newWith(5, 4, 3, 2, 1);
+        collection.removeIfWith(Predicates2.<Integer>in(), Lists.immutable.with(5, 3, 1));
+        assertEquals(this.getExpectedFiltered(4, 2), collection);
+    }
+
+    @Override
+    @Test
+    default void MutableCollection_injectIntoWith()
+    {
+        MutableCollection<Integer> collection = this.newWith(4, 3, 2, 1);
+        assertEquals(Integer.valueOf(51), collection.injectIntoWith(1, new Function3<Integer, Integer, Integer, Integer>()
+        {
+            @Override
+            public Integer value(Integer argument1, Integer argument2, Integer argument3)
+            {
+                return argument1 + argument2 + argument3;
+            }
+        }, 10));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/domain/A.java b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/A.java
new file mode 100644
index 000000000..282d084a1
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/A.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.domain;
+
+public interface A extends Comparable<A>
+{
+    double getDoubleValue();
+
+    @Override
+    default int compareTo(A other)
+    {
+        return Double.compare(this.getDoubleValue(), other.getDoubleValue());
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/domain/B.java b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/B.java
new file mode 100644
index 000000000..13806592e
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/B.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.domain;
+
+public class B implements A
+{
+    private final int i;
+
+    public B(int i)
+    {
+        this.i = i;
+    }
+
+    @Override
+    public double getDoubleValue()
+    {
+        return Integer.valueOf(this.i).doubleValue();
+    }
+
+    @Override
+    public String toString()
+    {
+        return "B{i=" + this.i + '}';
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || this.getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        B b = (B) o;
+
+        if (this.i != b.i)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return this.i;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/domain/C.java b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/C.java
new file mode 100644
index 000000000..4c89cc81e
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/domain/C.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.domain;
+
+public class C implements A
+{
+    private final double d;
+
+    public C(double d)
+    {
+        this.d = d;
+    }
+
+    @Override
+    public double getDoubleValue()
+    {
+        return this.d;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "C{d=" + this.d + '}';
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || this.getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        C c = (C) o;
+
+        if (Double.compare(c.d, this.d) != 0)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        long temp = Double.doubleToLongBits(this.d);
+        return (int) (temp ^ (temp >>> 32));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListIterableTestCase.java
new file mode 100644
index 000000000..e9ea1c682
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListIterableTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.list.ListIterable;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.api.tuple.Pair;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.impl.tuple.Tuples;
+import com.gs.collections.test.OrderedIterableWithDuplicatesTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface ListIterableTestCase extends OrderedIterableWithDuplicatesTestCase, TransformsToListTrait
+{
+    @Override
+    <T> ListIterable<T> newWith(T... elements);
+
+    @Override
+    default <T> ListIterable<T> getExpectedFiltered(T... elements)
+    {
+        return Lists.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableList<T> newMutableForFilter(T... elements)
+    {
+        return Lists.mutable.with(elements);
+    }
+
+    @Override
+    default <T> ListIterable<T> getExpectedTransformed(T... elements)
+    {
+        return Lists.immutable.with(elements);
+    }
+
+    @Test
+    default void ListIterable_forEachWithIndex()
+    {
+        RichIterable<Integer> integers = this.newWith(1, 2, 3);
+        MutableCollection<Pair<Integer, Integer>> result = Lists.mutable.with();
+        integers.forEachWithIndex((each, index) -> result.add(Tuples.pair(each, index)));
+        assertEquals(
+                Lists.immutable.with(Tuples.pair(1, 0), Tuples.pair(2, 1), Tuples.pair(3, 2)),
+                result);
+    }
+
+    @Test
+    default void ListIterable_indexOf()
+    {
+        ListIterable<Integer> integers = this.newWith(1, 2, 2, 3, 3, 3, 4, 4, 4, 4);
+        assertEquals(3, integers.indexOf(3));
+        assertEquals(-1, integers.indexOf(0));
+        assertEquals(-1, integers.indexOf(null));
+        ListIterable<Integer> integers2 = this.newWith(1, 2, 2, null, 3, 3, 3, null, 4, 4, 4, 4);
+        assertEquals(3, integers2.indexOf(null));
+    }
+
+    @Test
+    default void ListIterable_lastIndexOf()
+    {
+        ListIterable<Integer> integers = this.newWith(1, 2, 2, 3, 3, 3, 4, 4, 4, 4);
+        assertEquals(5, integers.lastIndexOf(3));
+        assertEquals(-1, integers.lastIndexOf(0));
+        assertEquals(-1, integers.lastIndexOf(null));
+        ListIterable<Integer> integers2 = this.newWith(1, 2, 2, null, 3, 3, 3, null, 4, 4, 4, 4);
+        assertEquals(7, integers2.lastIndexOf(null));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListTestCase.java
new file mode 100644
index 000000000..628e383b3
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/ListTestCase.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list;
+
+import java.util.List;
+
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.CollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface ListTestCase extends CollectionTestCase
+{
+    @Override
+    <T> List<T> newWith(T... elements);
+
+    @Test
+    default void List_get()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        assertEquals(Integer.valueOf(1), list.get(0));
+        assertEquals(Integer.valueOf(2), list.get(1));
+        assertEquals(Integer.valueOf(3), list.get(2));
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    default void List_get_negative()
+    {
+        this.newWith(1, 2, 3).get(-1);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    default void List_get_out_of_bounds()
+    {
+        this.newWith(1, 2, 3).get(4);
+    }
+
+    @Test
+    default void List_set()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        assertEquals(Integer.valueOf(2), list.set(1, 4));
+        assertEquals(Lists.immutable.with(1, 4, 3), list);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    default void List_set_negative()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        assertEquals(Integer.valueOf(2), list.set(-1, 4));
+        assertEquals(Lists.immutable.with(1, 4, 3), list);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    default void List_set_out_of_bounds()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        assertEquals(Integer.valueOf(2), list.set(4, 4));
+        assertEquals(Lists.immutable.with(1, 4, 3), list);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/TransformsToListTrait.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/TransformsToListTrait.java
new file mode 100644
index 000000000..d385e4648
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/TransformsToListTrait.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list;
+
+import com.gs.collections.api.list.ListIterable;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.api.list.primitive.MutableBooleanList;
+import com.gs.collections.api.list.primitive.MutableByteList;
+import com.gs.collections.api.list.primitive.MutableCharList;
+import com.gs.collections.api.list.primitive.MutableDoubleList;
+import com.gs.collections.api.list.primitive.MutableFloatList;
+import com.gs.collections.api.list.primitive.MutableIntList;
+import com.gs.collections.api.list.primitive.MutableLongList;
+import com.gs.collections.api.list.primitive.MutableShortList;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.impl.list.mutable.primitive.BooleanArrayList;
+import com.gs.collections.impl.list.mutable.primitive.ByteArrayList;
+import com.gs.collections.impl.list.mutable.primitive.CharArrayList;
+import com.gs.collections.impl.list.mutable.primitive.DoubleArrayList;
+import com.gs.collections.impl.list.mutable.primitive.FloatArrayList;
+import com.gs.collections.impl.list.mutable.primitive.IntArrayList;
+import com.gs.collections.impl.list.mutable.primitive.LongArrayList;
+import com.gs.collections.impl.list.mutable.primitive.ShortArrayList;
+import com.gs.collections.test.RichIterableTestCase;
+
+public interface TransformsToListTrait extends RichIterableTestCase
+{
+    @Override
+    default <T> ListIterable<T> getExpectedTransformed(T... elements)
+    {
+        return Lists.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableList<T> newMutableForTransform(T... elements)
+    {
+        return Lists.mutable.with(elements);
+    }
+
+    @Override
+    default MutableBooleanList newBooleanForTransform(boolean... elements)
+    {
+        return new BooleanArrayList(elements);
+    }
+
+    @Override
+    default MutableByteList newByteForTransform(byte... elements)
+    {
+        return new ByteArrayList(elements);
+    }
+
+    @Override
+    default MutableCharList newCharForTransform(char... elements)
+    {
+        return new CharArrayList(elements);
+    }
+
+    @Override
+    default MutableDoubleList newDoubleForTransform(double... elements)
+    {
+        return new DoubleArrayList(elements);
+    }
+
+    @Override
+    default MutableFloatList newFloatForTransform(float... elements)
+    {
+        return new FloatArrayList(elements);
+    }
+
+    @Override
+    default MutableIntList newIntForTransform(int... elements)
+    {
+        return new IntArrayList(elements);
+    }
+
+    @Override
+    default MutableLongList newLongForTransform(long... elements)
+    {
+        return new LongArrayList(elements);
+    }
+
+    @Override
+    default MutableShortList newShortForTransform(short... elements)
+    {
+        return new ShortArrayList(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/UnmodifiableListTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/UnmodifiableListTestCase.java
new file mode 100644
index 000000000..02ffbff14
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/UnmodifiableListTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list;
+
+import java.util.List;
+
+import com.gs.collections.test.UnmodifiableCollectionTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableListTestCase extends UnmodifiableCollectionTestCase, ListTestCase
+{
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void List_set()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        list.set(1, 4);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void List_set_negative()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        list.set(-1, 4);
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void List_set_out_of_bounds()
+    {
+        List<Integer> list = this.newWith(1, 2, 3);
+        list.set(4, 4);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTest.java
new file mode 100644
index 000000000..09262c1cb
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.immutable;
+
+import com.gs.collections.api.list.ImmutableList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableListTest implements ImmutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableList<T> newWith(T... elements)
+    {
+        return FastList.newListWith(elements).toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTestCase.java
new file mode 100644
index 000000000..4d7fe3cb2
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/immutable/ImmutableListTestCase.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.immutable;
+
+import java.util.List;
+
+import com.gs.collections.api.list.ImmutableList;
+import com.gs.collections.test.collection.immutable.ImmutableCollectionTestCase;
+import com.gs.collections.test.list.ListIterableTestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertSame;
+
+public interface ImmutableListTestCase extends ImmutableCollectionTestCase, ListIterableTestCase
+{
+    @Override
+    <T> ImmutableList<T> newWith(T... elements);
+
+    @Test
+    default void ImmutableList_castToList()
+    {
+        ImmutableList<Integer> immutableList = this.newWith(3, 3, 3, 2, 2, 1);
+        List<Integer> list = immutableList.castToList();
+        assertSame(immutableList, list);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/CompositeFastListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/CompositeFastListTest.java
new file mode 100644
index 000000000..bf976c93f
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/CompositeFastListTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.CompositeFastList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class CompositeFastListTest implements MutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        RichIterable<RichIterable<T>> chunks = FastList.newListWith(elements).chunk(3);
+        CompositeFastList<T> result = new CompositeFastList<>();
+        for (RichIterable<T> chunk : chunks)
+        {
+            result.addAll(FastList.newList(chunk));
+        }
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListNoIteratorTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListNoIteratorTest.java
new file mode 100644
index 000000000..5ed9278cd
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListNoIteratorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import java.util.Iterator;
+import java.util.ListIterator;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.NoIteratorTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class FastListNoIteratorTest implements MutableListTestCase, NoIteratorTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        MutableList<T> result = new FastListNoIterator<T>();
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+
+    public static final class FastListNoIterator<T> extends FastList<T>
+    {
+        @Override
+        public Iterator<T> iterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to iterator()");
+        }
+
+        @Override
+        public ListIterator<T> listIterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to listIterator()");
+        }
+
+        @Override
+        public ListIterator<T> listIterator(int index)
+        {
+            throw new AssertionError("No iteration patterns should delegate to listIterator()");
+        }
+    }
+
+    @Override
+    public void Iterable_remove()
+    {
+        NoIteratorTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    public void OrderedIterable_next()
+    {
+        // Not applicable
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListTest.java
new file mode 100644
index 000000000..43cf106cc
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/FastListTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class FastListTest implements MutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        return FastList.newListWith(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/ListAdapterTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/ListAdapterTest.java
new file mode 100644
index 000000000..2d642ee72
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/ListAdapterTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.ListAdapter;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ListAdapterTest implements MutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        return ListAdapter.adapt(new ArrayList<>(Arrays.asList(elements)));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MultiReaderFastListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MultiReaderFastListTest.java
new file mode 100644
index 000000000..5cf89b837
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MultiReaderFastListTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.list.mutable.MultiReaderFastList;
+import com.gs.collections.test.collection.mutable.MultiReaderMutableCollectionTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Java8Runner.class)
+public class MultiReaderFastListTest implements MutableListTestCase, MultiReaderMutableCollectionTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MultiReaderFastList<T> newWith(T... elements)
+    {
+        return MultiReaderFastList.newListWith(elements);
+    }
+
+    @Override
+    @Test
+    public void Iterable_remove()
+    {
+        MultiReaderMutableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test
+    public void RichIterable_iterator_iterationOrder()
+    {
+        MutableCollection<Integer> iterationOrder = this.newMutableForFilter();
+        MultiReaderFastList<Integer> instanceUnderTest = this.newWith(4, 4, 4, 4, 3, 3, 3, 2, 2, 1);
+        instanceUnderTest.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                iterationOrder.add(iterator.next());
+            }
+        });
+        assertEquals(this.expectedIterationOrder(), iterationOrder);
+    }
+
+    @Override
+    @Test
+    public void OrderedIterable_next()
+    {
+        // Does not support iterator outside withReadLockAndDelegate
+
+        MultiReaderFastList<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                Integer integer = iterator.next();
+                mutableCollection.add(integer);
+            }
+
+            assertEquals(this.getExpectedFiltered(3, 3, 3, 2, 2, 1), mutableCollection);
+            assertFalse(iterator.hasNext());
+        });
+    }
+
+    @Test
+    public void MultiReaderFastList_hasNext()
+    {
+        MultiReaderFastList<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> assertTrue(delegate.iterator().hasNext()));
+        MultiReaderFastList<?> emptyIterable = this.newWith();
+        emptyIterable.withReadLockAndDelegate(delegate -> assertFalse(delegate.iterator().hasNext()));
+    }
+
+    @Test
+    public void MultiReaderFastList_next_throws_at_end()
+    {
+        MultiReaderFastList<Integer> iterable = this.newWith(3, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertFalse(iterator.hasNext());
+            assertThrows(NoSuchElementException.class, (Runnable) iterator::next);
+        });
+    }
+
+    @Test
+    public void MultiReaderFastList_next_throws_on_empty()
+    {
+        MultiReaderFastList<Object> iterable = this.newWith();
+        assertThrows(
+                NoSuchElementException.class,
+                () -> iterable.withReadLockAndDelegate(delegate -> delegate.iterator().next()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MutableListTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MutableListTestCase.java
new file mode 100644
index 000000000..da6ff8404
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/MutableListTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.MutableOrderedIterableTestCase;
+import com.gs.collections.test.collection.mutable.MutableCollectionTestCase;
+import com.gs.collections.test.list.ListIterableTestCase;
+import com.gs.collections.test.list.ListTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertSame;
+
+public interface MutableListTestCase extends MutableCollectionTestCase, ListTestCase, ListIterableTestCase, MutableOrderedIterableTestCase
+{
+    @Override
+    <T> MutableList<T> newWith(T... elements);
+
+    @Test
+    default void MutableList_sortThis()
+    {
+        MutableList<Integer> mutableList = this.newWith(5, 1, 4, 2, 3);
+        MutableList<Integer> sortedList = mutableList.sortThis();
+        assertSame(mutableList, sortedList);
+        assertEquals(Lists.immutable.with(1, 2, 3, 4, 5), sortedList);
+    }
+
+    @Test
+    default void MutableList_sortThis_comparator()
+    {
+        MutableList<Integer> mutableList = this.newWith(5, 1, 4, 2, 3);
+        MutableList<Integer> sortedList = mutableList.sortThis(Comparators.reverseNaturalOrder());
+        assertSame(mutableList, sortedList);
+        assertEquals(Lists.immutable.with(5, 4, 3, 2, 1), sortedList);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/SynchronizedMutableListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/SynchronizedMutableListTest.java
new file mode 100644
index 000000000..3bebd3a7b
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/SynchronizedMutableListTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SynchronizedMutableListTest implements MutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        return FastList.newListWith(elements).asSynchronized();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTest.java
new file mode 100644
index 000000000..6b3d82bed
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.impl.list.mutable.FastList;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnmodifiableMutableListTest implements UnmodifiableMutableListTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableList<T> newWith(T... elements)
+    {
+        return FastList.newListWith(elements).asUnmodifiable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTestCase.java
new file mode 100644
index 000000000..60c3de0bd
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/list/mutable/UnmodifiableMutableListTestCase.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.list.mutable;
+
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.test.UnmodifiableMutableCollectionTestCase;
+import com.gs.collections.test.list.UnmodifiableListTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableMutableListTestCase extends UnmodifiableMutableCollectionTestCase, UnmodifiableListTestCase, MutableListTestCase
+{
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableList_sortThis()
+    {
+        this.newWith(5, 1, 4, 2, 3).sortThis();
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableMutableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableList_sortThis_comparator()
+    {
+        this.newWith(5, 1, 4, 2, 3).sortThis(Comparators.reverseNaturalOrder());
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/MapIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/MapIterableTestCase.java
new file mode 100644
index 000000000..a17e1e0b6
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/MapIterableTestCase.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map;
+
+import com.gs.collections.api.map.MapIterable;
+import com.gs.collections.test.RichIterableWithDuplicatesTestCase;
+
+public interface MapIterableTestCase extends RichIterableWithDuplicatesTestCase
+{
+    @Override
+    <T> MapIterable<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/SortedMapIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/SortedMapIterableTestCase.java
new file mode 100644
index 000000000..d2200c023
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/SortedMapIterableTestCase.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map;
+
+import com.gs.collections.api.list.ListIterable;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.api.map.sorted.SortedMapIterable;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.test.OrderedIterableTestCase;
+import com.gs.collections.test.list.TransformsToListTrait;
+
+public interface SortedMapIterableTestCase extends MapIterableTestCase, OrderedIterableTestCase, TransformsToListTrait
+{
+    @Override
+    <T> SortedMapIterable<Object, T> newWith(T... elements);
+
+    @Override
+    default <T> ListIterable<T> getExpectedFiltered(T... elements)
+    {
+        return Lists.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableList<T> newMutableForFilter(T... elements)
+    {
+        return Lists.mutable.with(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/UnsortedMapIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/UnsortedMapIterableTestCase.java
new file mode 100644
index 000000000..e61655bb5
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/UnsortedMapIterableTestCase.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map;
+
+import com.gs.collections.api.bag.MutableBag;
+import com.gs.collections.api.bag.UnsortedBag;
+import com.gs.collections.api.map.UnsortedMapIterable;
+import com.gs.collections.impl.factory.Bags;
+import com.gs.collections.test.UnorderedIterableTestCase;
+import com.gs.collections.test.bag.TransformsToBagTrait;
+
+public interface UnsortedMapIterableTestCase extends MapIterableTestCase, UnorderedIterableTestCase, TransformsToBagTrait
+{
+    @Override
+    <T> UnsortedMapIterable<Object, T> newWith(T... elements);
+
+    @Override
+    default <T> UnsortedBag<T> getExpectedFiltered(T... elements)
+    {
+        return Bags.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableBag<T> newMutableForFilter(T... elements)
+    {
+        return Bags.mutable.with(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableMapTestCase.java
new file mode 100644
index 000000000..77f2da434
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableMapTestCase.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.immutable;
+
+import com.gs.collections.api.map.ImmutableMap;
+import com.gs.collections.test.ImmutableUnorderedIterableTestCase;
+import com.gs.collections.test.map.UnsortedMapIterableTestCase;
+
+public interface ImmutableMapTestCase extends UnsortedMapIterableTestCase, ImmutableUnorderedIterableTestCase
+{
+    @Override
+    <T> ImmutableMap<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableUnifiedMapTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableUnifiedMapTest.java
new file mode 100644
index 000000000..636f62456
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/immutable/ImmutableUnifiedMapTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.immutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.map.ImmutableMap;
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(Java8Runner.class)
+public class ImmutableUnifiedMapTest implements ImmutableMapTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public final <T> ImmutableMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+
+        MutableMap<Object, T> result = new UnifiedMap<>();
+        for (T each : elements)
+        {
+            assertNull(result.put(random.nextDouble(), each));
+        }
+        return result.toImmutable();
+    }
+
+    @Test
+    public void sanity()
+    {
+        assertEquals("ImmutableUnifiedMap", this.newWith(1, 2, 3, 4, 5).getClass().getSimpleName());
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/MutableMapTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/MutableMapTestCase.java
new file mode 100644
index 000000000..90a5732e2
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/MutableMapTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.mutable;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.utility.Iterate;
+import com.gs.collections.test.MutableUnorderedIterableTestCase;
+import com.gs.collections.test.map.UnsortedMapIterableTestCase;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.Assert.assertThat;
+
+public interface MutableMapTestCase extends UnsortedMapIterableTestCase, MutableUnorderedIterableTestCase
+{
+    @Override
+    <T> MutableMap<Object, T> newWith(T... elements);
+
+    @Override
+    default void Iterable_remove()
+    {
+        MutableMap<Object, Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        iterator.next();
+        iterator.remove();
+        assertEquals(this.allowsDuplicates() ? 5 : 2, Iterate.sizeOf(iterable));
+        assertThat(iterable.toBag(), isOneOf(
+                this.getExpectedFiltered(3, 3, 3, 2, 2),
+                this.getExpectedFiltered(3, 3, 3, 2, 1),
+                this.getExpectedFiltered(3, 3, 2, 2, 1)));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/UnifiedMapTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/UnifiedMapTest.java
new file mode 100644
index 000000000..b3cfc4f97
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/UnifiedMapTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.mutable;
+
+import java.util.Random;
+
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+
+@RunWith(Java8Runner.class)
+public class UnifiedMapTest implements MutableMapTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public <T> MutableMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+        MutableMap<Object, T> result = new UnifiedMap<>();
+        for (T each : elements)
+        {
+            assertNull(result.put(random.nextDouble(), each));
+        }
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/MutableSortedMapIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/MutableSortedMapIterableTestCase.java
new file mode 100644
index 000000000..1d36c0d87
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/MutableSortedMapIterableTestCase.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.mutable.sorted;
+
+import com.gs.collections.api.map.sorted.MutableSortedMap;
+import com.gs.collections.test.MutableSortedIterableTestCase;
+import com.gs.collections.test.map.SortedMapIterableTestCase;
+
+public interface MutableSortedMapIterableTestCase extends SortedMapIterableTestCase, MutableSortedIterableTestCase
+{
+    @Override
+    <T> MutableSortedMap<Object, T> newWith(T... elements);
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/TreeSortedMapTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/TreeSortedMapTest.java
new file mode 100644
index 000000000..70c4ba6f5
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/sorted/TreeSortedMapTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.mutable.sorted;
+
+import com.gs.collections.api.map.sorted.MutableSortedMap;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.map.sorted.mutable.TreeSortedMap;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+
+@RunWith(Java8Runner.class)
+public class TreeSortedMapTest implements MutableSortedMapIterableTestCase
+{
+    @Override
+    public <T> MutableSortedMap<Object, T> newWith(T... elements)
+    {
+        int i = elements.length;
+        MutableSortedMap<Object, T> result = new TreeSortedMap<>(Comparators.reverseNaturalOrder());
+        for (T each : elements)
+        {
+            assertNull(result.put(i, each));
+            i--;
+        }
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/strategy/UnifiedMapWithHashingStrategyTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/strategy/UnifiedMapWithHashingStrategyTest.java
new file mode 100644
index 000000000..f2bedb84d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/map/mutable/strategy/UnifiedMapWithHashingStrategyTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.map.mutable.strategy;
+
+import java.util.Random;
+
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.block.factory.HashingStrategies;
+import com.gs.collections.impl.map.strategy.mutable.UnifiedMapWithHashingStrategy;
+import com.gs.collections.test.map.mutable.MutableMapTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+
+@RunWith(Java8Runner.class)
+public class UnifiedMapWithHashingStrategyTest implements MutableMapTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @Override
+    public <T> MutableMap<Object, T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+        MutableMap<Object, T> result = new UnifiedMapWithHashingStrategy<>(HashingStrategies.defaultStrategy());
+        for (T each : elements)
+        {
+            assertNull(result.put(random.nextDouble(), each));
+        }
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetIterableTestCase.java
new file mode 100644
index 000000000..3ff8b8742
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetIterableTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set;
+
+import com.gs.collections.api.set.SetIterable;
+import com.gs.collections.test.RichIterableUniqueTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+
+public interface SetIterableTestCase extends RichIterableUniqueTestCase
+{
+    @Override
+    <T> SetIterable<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void RichIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 2, 1).toArray();
+        assertArrayEquals(new Object[]{3, 2, 1}, array);
+    }
+
+    @Test
+    default void SetIterable_union()
+    {
+        SetIterable<Integer> union = this.newWith(3, 2, 1).union(this.newWith(5, 4, 3));
+        assertEquals(this.newWith(5, 4, 3, 2, 1), union);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetTestCase.java
new file mode 100644
index 000000000..6d3c1f724
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/SetTestCase.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.test.CollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertPostSerializedEqualsAndHashCode;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+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
+{
+    @Override
+    <T> Set<T> newWith(T... elements);
+
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Override
+    @Test
+    default void Object_equalsAndHashCode()
+    {
+        assertPostSerializedEqualsAndHashCode(this.newWith(3, 2, 1));
+
+        assertNotEquals(this.newWith(4, 3, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 3, 2, 1));
+
+        assertNotEquals(this.newWith(2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(2, 1));
+
+        assertNotEquals(this.newWith(4, 2, 1), this.newWith(3, 2, 1));
+        assertNotEquals(this.newWith(3, 2, 1), this.newWith(4, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        Set<Integer> iterable = this.newWith(3, 2, 1);
+
+        MutableSet<Integer> mutableSet = Sets.mutable.with();
+
+        Iterator<Integer> iterator = iterable.iterator();
+        while (iterator.hasNext())
+        {
+            Integer integer = iterator.next();
+            assertTrue(mutableSet.add(integer));
+        }
+
+        assertEquals(iterable, mutableSet);
+        assertFalse(iterator.hasNext());
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        Set<Integer> set = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = set.iterator();
+        iterator.next();
+        iterator.remove();
+        assertThat(set, isOneOf(
+                this.newWith(1, 2),
+                this.newWith(1, 3),
+                this.newWith(2, 3)));
+    }
+
+    @Override
+    @Test
+    default void Collection_add()
+    {
+        Collection<Integer> collection = this.newWith(1, 2, 3);
+        assertFalse(collection.add(3));
+    }
+
+    @Override
+    @Test
+    default void Collection_size()
+    {
+        assertThat(this.newWith(3, 2, 1), hasSize(3));
+        assertThat(this.newWith(), hasSize(0));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/TransformsToUnsortedSetTrait.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/TransformsToUnsortedSetTrait.java
new file mode 100644
index 000000000..49791ebd6
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/TransformsToUnsortedSetTrait.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.api.set.UnsortedSetIterable;
+import com.gs.collections.api.set.primitive.MutableBooleanSet;
+import com.gs.collections.api.set.primitive.MutableByteSet;
+import com.gs.collections.api.set.primitive.MutableCharSet;
+import com.gs.collections.api.set.primitive.MutableDoubleSet;
+import com.gs.collections.api.set.primitive.MutableFloatSet;
+import com.gs.collections.api.set.primitive.MutableIntSet;
+import com.gs.collections.api.set.primitive.MutableLongSet;
+import com.gs.collections.api.set.primitive.MutableShortSet;
+import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.impl.set.mutable.primitive.BooleanHashSet;
+import com.gs.collections.impl.set.mutable.primitive.ByteHashSet;
+import com.gs.collections.impl.set.mutable.primitive.CharHashSet;
+import com.gs.collections.impl.set.mutable.primitive.DoubleHashSet;
+import com.gs.collections.impl.set.mutable.primitive.FloatHashSet;
+import com.gs.collections.impl.set.mutable.primitive.IntHashSet;
+import com.gs.collections.impl.set.mutable.primitive.LongHashSet;
+import com.gs.collections.impl.set.mutable.primitive.ShortHashSet;
+import com.gs.collections.test.RichIterableTestCase;
+
+// TODO Collected sets should return bags
+public interface TransformsToUnsortedSetTrait extends RichIterableTestCase
+{
+    @Override
+    default <T> UnsortedSetIterable<T> getExpectedTransformed(T... elements)
+    {
+        return Sets.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableSet<T> newMutableForTransform(T... elements)
+    {
+        return Sets.mutable.with(elements);
+    }
+
+    @Override
+    default MutableBooleanSet newBooleanForTransform(boolean... elements)
+    {
+        return new BooleanHashSet(elements);
+    }
+
+    @Override
+    default MutableByteSet newByteForTransform(byte... elements)
+    {
+        return new ByteHashSet(elements);
+    }
+
+    @Override
+    default MutableCharSet newCharForTransform(char... elements)
+    {
+        return new CharHashSet(elements);
+    }
+
+    @Override
+    default MutableDoubleSet newDoubleForTransform(double... elements)
+    {
+        return new DoubleHashSet(elements);
+    }
+
+    @Override
+    default MutableFloatSet newFloatForTransform(float... elements)
+    {
+        return new FloatHashSet(elements);
+    }
+
+    @Override
+    default MutableIntSet newIntForTransform(int... elements)
+    {
+        return new IntHashSet(elements);
+    }
+
+    @Override
+    default MutableLongSet newLongForTransform(long... elements)
+    {
+        return new LongHashSet(elements);
+    }
+
+    @Override
+    default MutableShortSet newShortForTransform(short... elements)
+    {
+        return new ShortHashSet(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnmodifiableSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnmodifiableSetTestCase.java
new file mode 100644
index 000000000..023fd7e54
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnmodifiableSetTestCase.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set;
+
+import com.gs.collections.test.UnmodifiableCollectionTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableSetTestCase extends UnmodifiableCollectionTestCase, SetTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void Collection_add()
+    {
+        UnmodifiableCollectionTestCase.super.Collection_add();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnsortedSetIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnsortedSetIterableTestCase.java
new file mode 100644
index 000000000..523ff528e
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/UnsortedSetIterableTestCase.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set;
+
+import java.util.Iterator;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.api.set.UnsortedSetIterable;
+import com.gs.collections.impl.bag.mutable.HashBag;
+import com.gs.collections.impl.factory.Bags;
+import com.gs.collections.impl.factory.Sets;
+import com.gs.collections.test.UnorderedIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+public interface UnsortedSetIterableTestCase extends SetIterableTestCase, UnorderedIterableTestCase, TransformsToUnsortedSetTrait
+{
+    @Override
+    <T> UnsortedSetIterable<T> newWith(T... elements);
+
+    @Override
+    default <T> UnsortedSetIterable<T> getExpectedFiltered(T... elements)
+    {
+        return Sets.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableSet<T> newMutableForFilter(T... elements)
+    {
+        return Sets.mutable.with(elements);
+    }
+
+    @Override
+    default <T> UnsortedSetIterable<T> getExpectedTransformed(T... elements)
+    {
+        return Sets.immutable.with(elements);
+    }
+
+    @Override
+    default <T> MutableSet<T> newMutableForTransform(T... elements)
+    {
+        return Sets.mutable.with(elements);
+    }
+
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        Iterator<Integer> iterator = iterable.iterator();
+        while (iterator.hasNext())
+        {
+            Integer integer = iterator.next();
+            mutableCollection.add(integer);
+        }
+
+        assertEquals(this.getExpectedFiltered(3, 2, 1), mutableCollection);
+        assertFalse(iterator.hasNext());
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getFirst()
+    {
+        RichIterable<Integer> integers = this.newWith(3, 2, 1);
+        Integer first = integers.getFirst();
+        assertThat(first, isOneOf(3, 2, 1));
+        assertEquals(integers.iterator().next(), first);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getLast()
+    {
+        RichIterable<Integer> integers = this.newWith(3, 2, 1);
+        Integer last = integers.getLast();
+        assertThat(last, isOneOf(3, 2, 1));
+    }
+
+    @Override
+    @Test
+    default void RichIterable_toArray()
+    {
+        Object[] array = this.newWith(3, 2, 1).toArray();
+        assertEquals(Bags.immutable.with(3, 2, 1), HashBag.newBagWith(array));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTest.java
new file mode 100644
index 000000000..dcdb9abc5
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.immutable;
+
+import com.gs.collections.api.set.ImmutableSet;
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.set.mutable.UnifiedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableSetTest implements ImmutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = new UnifiedSet<>();
+        IterableTestCase.addAllTo(elements, result);
+        return result.toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTestCase.java
new file mode 100644
index 000000000..40fa6e001
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/ImmutableSetTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.immutable;
+
+import java.util.Set;
+
+import com.gs.collections.api.collection.ImmutableCollection;
+import com.gs.collections.api.set.ImmutableSet;
+import com.gs.collections.test.collection.immutable.ImmutableCollectionUniqueTestCase;
+import com.gs.collections.test.set.UnsortedSetIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+
+public interface ImmutableSetTestCase extends ImmutableCollectionUniqueTestCase, UnsortedSetIterableTestCase
+{
+    @Override
+    <T> ImmutableSet<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        ImmutableCollectionUniqueTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    default void ImmutableCollection_newWith()
+    {
+        ImmutableCollection<Integer> immutableCollection = this.newWith(3, 2, 1);
+        ImmutableCollection<Integer> newWith = immutableCollection.newWith(4);
+
+        assertEquals(this.newWith(3, 2, 1, 4), newWith);
+        assertNotSame(immutableCollection, newWith);
+        assertThat(newWith, instanceOf(ImmutableCollection.class));
+
+        ImmutableCollection<Integer> newWith2 = newWith.newWith(4);
+
+        assertEquals(this.newWith(3, 2, 1, 4), newWith2);
+        assertSame(newWith, newWith2);
+    }
+
+    @Test
+    default void ImmutableSet_castToSet()
+    {
+        ImmutableSet<Integer> immutableSet = this.newWith(3, 2, 1);
+        Set<Integer> set = immutableSet.castToSet();
+        assertSame(immutableSet, set);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableSortedSetIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableSortedSetIterableTestCase.java
new file mode 100644
index 000000000..a69eb457e
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableSortedSetIterableTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.immutable.sorted;
+
+import com.gs.collections.api.set.sorted.ImmutableSortedSet;
+import com.gs.collections.test.collection.immutable.ImmutableCollectionTestCase;
+import com.gs.collections.test.set.sorted.SortedSetIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+
+public interface ImmutableSortedSetIterableTestCase extends SortedSetIterableTestCase, ImmutableCollectionTestCase
+{
+    @Override
+    <T> ImmutableSortedSet<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void ImmutableCollection_newWith()
+    {
+        ImmutableSortedSet<Integer> immutableCollection = this.newWith(3, 2, 1);
+        ImmutableSortedSet<Integer> newWith = immutableCollection.newWith(4);
+
+        assertEquals(this.newWith(4, 3, 2, 1).castToSortedSet(), newWith.castToSortedSet());
+        assertNotSame(immutableCollection, newWith);
+        assertThat(newWith, instanceOf(ImmutableSortedSet.class));
+
+        ImmutableSortedSet<Integer> newWith2 = newWith.newWith(4);
+        assertSame(newWith, newWith2);
+        assertEquals(this.newWith(4, 3, 2, 1).castToSortedSet(), newWith2.castToSortedSet());
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableTreeSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableTreeSetTest.java
new file mode 100644
index 000000000..06fb5e2f8
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/sorted/ImmutableTreeSetTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.immutable.sorted;
+
+import com.gs.collections.api.set.sorted.ImmutableSortedSet;
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.factory.SortedSets;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableTreeSetTest implements ImmutableSortedSetIterableTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = SortedSets.mutable.with(Comparators.reverseNaturalOrder());
+        IterableTestCase.addAllTo(elements, result);
+        return result.toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/strategy/ImmutableUnifiedSetWithHashingStrategyTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/strategy/ImmutableUnifiedSetWithHashingStrategyTest.java
new file mode 100644
index 000000000..4c21ba70a
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/immutable/strategy/ImmutableUnifiedSetWithHashingStrategyTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.immutable.strategy;
+
+import com.gs.collections.api.set.ImmutableSet;
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.block.factory.HashingStrategies;
+import com.gs.collections.impl.set.strategy.mutable.UnifiedSetWithHashingStrategy;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.set.immutable.ImmutableSetTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableUnifiedSetWithHashingStrategyTest implements ImmutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = UnifiedSetWithHashingStrategy.newSet(HashingStrategies.defaultStrategy());
+        IterableTestCase.addAllTo(elements, result);
+        return result.toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/HashBiMapKeySetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/HashBiMapKeySetTest.java
new file mode 100644
index 000000000..7dd0f788b
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/HashBiMapKeySetTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import java.util.Set;
+
+import com.gs.collections.api.bimap.MutableBiMap;
+import com.gs.collections.impl.bimap.mutable.HashBiMap;
+import com.gs.collections.test.set.SetTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class HashBiMapKeySetTest implements SetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> Set<T> newWith(T... elements)
+    {
+        MutableBiMap<T, T> result = new HashBiMap<>();
+        for (T element : elements)
+        {
+            if (result.containsKey(element))
+            {
+                // throw new IllegalStateException();
+            }
+            result.put(element, element);
+        }
+        return result.keySet();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    public void Collection_add()
+    {
+        // TODO Move up to a keySet view abstraction
+        SetTestCase.super.Collection_add();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MultiReaderUnifiedSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MultiReaderUnifiedSetTest.java
new file mode 100644
index 000000000..256e6572d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MultiReaderUnifiedSetTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import com.gs.collections.api.collection.MutableCollection;
+import com.gs.collections.impl.set.mutable.MultiReaderUnifiedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.collection.mutable.MultiReaderMutableCollectionTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Java8Runner.class)
+public class MultiReaderUnifiedSetTest implements MutableSetTestCase, MultiReaderMutableCollectionTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MultiReaderUnifiedSet<T> newWith(T... elements)
+    {
+        MultiReaderUnifiedSet<T> result = MultiReaderUnifiedSet.newSet();
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+
+    @Test
+    @Override
+    public void Iterable_remove()
+    {
+        MultiReaderMutableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Test
+    @Override
+    public void Iterable_next()
+    {
+        MultiReaderMutableCollectionTestCase.super.Iterable_next();
+    }
+
+    @Override
+    public void RichIterable_getFirst()
+    {
+        MultiReaderMutableCollectionTestCase.super.RichIterable_getFirst();
+    }
+
+    @Override
+    public void RichIterable_getLast()
+    {
+        MultiReaderMutableCollectionTestCase.super.RichIterable_getLast();
+    }
+
+    // TODO Is it possible to pull with withReadLockAndDelegate to MultiReaderMutableCollection?
+    // TODO Is it possible to pull with withWriteLockAndDelegate to MultiReaderMutableCollection?
+    @Override
+    @Test
+    public void RichIterable_iterator_iterationOrder()
+    {
+        MutableCollection<Integer> iterationOrder = this.newMutableForFilter();
+        MultiReaderUnifiedSet<Integer> instanceUnderTest = this.newWith(4, 3, 2, 1);
+        instanceUnderTest.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                iterationOrder.add(iterator.next());
+            }
+        });
+        assertEquals(this.expectedIterationOrder(), iterationOrder);
+    }
+
+    @Test
+    public void MultiReaderUnifiedSet_next()
+    {
+        MultiReaderUnifiedSet<Integer> iterable = this.newWith(3, 2, 1);
+
+        MutableCollection<Integer> mutableCollection = this.newMutableForFilter();
+
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            while (iterator.hasNext())
+            {
+                Integer integer = iterator.next();
+                mutableCollection.add(integer);
+            }
+
+            assertEquals(this.getExpectedFiltered(3, 2, 1), mutableCollection);
+            assertFalse(iterator.hasNext());
+        });
+    }
+
+    @Test
+    public void MultiReaderUnifiedSet_hasNext()
+    {
+        MultiReaderUnifiedSet<Integer> iterable = this.newWith(3, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> assertTrue(delegate.iterator().hasNext()));
+        MultiReaderUnifiedSet<?> emptyIterable = this.newWith();
+        emptyIterable.withReadLockAndDelegate(delegate -> assertFalse(delegate.iterator().hasNext()));
+    }
+
+    @Test
+    public void MultiReaderUnifiedSet_next_throws_at_end()
+    {
+        MultiReaderUnifiedSet<Integer> iterable = this.newWith(3, 2, 1);
+        iterable.withReadLockAndDelegate(delegate -> {
+            Iterator<Integer> iterator = delegate.iterator();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertTrue(iterator.hasNext());
+            iterator.next();
+            assertFalse(iterator.hasNext());
+            assertThrows(NoSuchElementException.class, (Runnable) iterator::next);
+        });
+    }
+
+    @Test
+    public void MultiReaderUnifiedSet_next_throws_on_empty()
+    {
+        MultiReaderUnifiedSet<Object> iterable = this.newWith();
+        assertThrows(
+                NoSuchElementException.class,
+                () -> iterable.withReadLockAndDelegate(delegate -> delegate.iterator().next()));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MutableSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MutableSetTestCase.java
new file mode 100644
index 000000000..965b8ef41
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/MutableSetTestCase.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.test.collection.mutable.MutableCollectionUniqueTestCase;
+import com.gs.collections.test.set.SetTestCase;
+import com.gs.collections.test.set.UnsortedSetIterableTestCase;
+import org.junit.Test;
+
+public interface MutableSetTestCase extends SetTestCase, UnsortedSetIterableTestCase, MutableCollectionUniqueTestCase
+{
+    @Override
+    <T> MutableSet<T> newWith(T... elements);
+
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Override
+    default void Object_equalsAndHashCode()
+    {
+        UnsortedSetIterableTestCase.super.Object_equalsAndHashCode();
+    }
+
+    @Override
+    default void Iterable_next()
+    {
+        UnsortedSetIterableTestCase.super.Iterable_next();
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        SetTestCase.super.Iterable_remove();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SetAdapterTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SetAdapterTest.java
new file mode 100644
index 000000000..28d4b39f6
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SetAdapterTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import java.util.HashSet;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.set.mutable.SetAdapter;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SetAdapterTest implements MutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = SetAdapter.adapt(new HashSet<>());
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SynchronizedMutableSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SynchronizedMutableSetTest.java
new file mode 100644
index 000000000..c88dcc90d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/SynchronizedMutableSetTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.set.mutable.UnifiedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SynchronizedMutableSetTest implements MutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = UnifiedSet.newSet();
+        IterableTestCase.addAllTo(elements, result);
+        return result.asSynchronized();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedMapKeySetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedMapKeySetTest.java
new file mode 100644
index 000000000..69b6600c9
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedMapKeySetTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import java.util.Random;
+import java.util.Set;
+
+import com.gs.collections.api.map.MutableMap;
+import com.gs.collections.impl.map.mutable.UnifiedMap;
+import com.gs.collections.test.set.SetTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNull;
+
+// TODO MapIterable.keySet() should return SetIterable, and use SetIterableTestCase here
+@RunWith(Java8Runner.class)
+public class UnifiedMapKeySetTest implements SetTestCase
+{
+    private static final long CURRENT_TIME_MILLIS = System.currentTimeMillis();
+
+    @SafeVarargs
+    @Override
+    public final <T> Set<T> newWith(T... elements)
+    {
+        Random random = new Random(CURRENT_TIME_MILLIS);
+
+        MutableMap<T, Double> result = new UnifiedMap<>();
+        for (T element : elements)
+        {
+            assertNull(result.put(element, random.nextDouble()));
+        }
+        return result.keySet();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    public void Collection_add()
+    {
+        // TODO Move up to a keySet view abstraction
+        SetTestCase.super.Collection_add();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedSetTest.java
new file mode 100644
index 000000000..fc14f29b7
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnifiedSetTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.set.mutable.UnifiedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnifiedSetTest implements MutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = new UnifiedSet<>();
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTest.java
new file mode 100644
index 000000000..a7b659057
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.set.mutable.UnifiedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnmodifiableMutableSetTest implements UnmodifiableMutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = UnifiedSet.newSet();
+        IterableTestCase.addAllTo(elements, result);
+        return result.asUnmodifiable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTestCase.java
new file mode 100644
index 000000000..524faf00a
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/UnmodifiableMutableSetTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable;
+
+import com.gs.collections.test.UnmodifiableMutableCollectionTestCase;
+import com.gs.collections.test.set.UnmodifiableSetTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableMutableSetTestCase extends UnmodifiableMutableCollectionTestCase, UnmodifiableSetTestCase, MutableSetTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableSetTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIf()
+    {
+        UnmodifiableMutableCollectionTestCase.super.MutableCollection_removeIf();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIfWith()
+    {
+        UnmodifiableMutableCollectionTestCase.super.MutableCollection_removeIfWith();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/MutableSortedSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/MutableSortedSetTestCase.java
new file mode 100644
index 000000000..35c087a46
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/MutableSortedSetTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.test.MutableSortedIterableTestCase;
+import com.gs.collections.test.collection.mutable.MutableCollectionUniqueTestCase;
+import com.gs.collections.test.set.sorted.SortedSetIterableTestCase;
+import com.gs.collections.test.set.sorted.SortedSetTestCase;
+
+public interface MutableSortedSetTestCase extends SortedSetIterableTestCase, MutableCollectionUniqueTestCase, SortedSetTestCase, MutableSortedIterableTestCase
+{
+    @Override
+    <T> MutableSortedSet<T> newWith(T... elements);
+
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Override
+    default void Iterable_remove()
+    {
+        // Both implementations are the same
+        SortedSetTestCase.super.Iterable_remove();
+        MutableSortedIterableTestCase.super.Iterable_remove();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SortedSetAdapterTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SortedSetAdapterTest.java
new file mode 100644
index 000000000..92ee155d0
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SortedSetAdapterTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import java.util.TreeSet;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.set.sorted.mutable.SortedSetAdapter;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SortedSetAdapterTest implements MutableSortedSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = SortedSetAdapter.adapt(new TreeSet<>(Comparators.reverseNaturalOrder()));
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SynchronizedMutableSortedSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SynchronizedMutableSortedSetTest.java
new file mode 100644
index 000000000..e33872024
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/SynchronizedMutableSortedSetTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.set.sorted.mutable.TreeSortedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SynchronizedMutableSortedSetTest implements MutableSortedSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = TreeSortedSet.newSet(Comparators.reverseNaturalOrder());
+        IterableTestCase.addAllTo(elements, result);
+        return result.asSynchronized();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetNoIteratorTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetNoIteratorTest.java
new file mode 100644
index 000000000..47c28b7be
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetNoIteratorTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import java.util.Comparator;
+import java.util.Iterator;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.set.sorted.mutable.TreeSortedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.NoIteratorTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+
+@Ignore("Requires scapegoat tree implementation")
+@RunWith(Java8Runner.class)
+public class TreeSortedSetNoIteratorTest implements MutableSortedSetTestCase, NoIteratorTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = new TreeSortedSetNoIterator<T>(Comparators.reverseNaturalOrder());
+        IterableTestCase.addAllTo(elements, result);
+        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 TreeSortedSetNoIterator<T> extends TreeSortedSet<T>
+    {
+        public TreeSortedSetNoIterator()
+        {
+            // For serialization
+        }
+
+        public TreeSortedSetNoIterator(Comparator<? super T> comparator)
+        {
+            super(comparator);
+        }
+
+        @Override
+        public Iterator<T> iterator()
+        {
+            throw new AssertionError("No iteration patterns should delegate to iterator()");
+        }
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetTest.java
new file mode 100644
index 000000000..dbde6f8f8
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/TreeSortedSetTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.set.sorted.mutable.TreeSortedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class TreeSortedSetTest implements MutableSortedSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = TreeSortedSet.newSet(Comparators.reverseNaturalOrder());
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTest.java
new file mode 100644
index 000000000..ada1ff233
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.set.sorted.mutable.TreeSortedSet;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnmodifiableMutableSortedSetTest implements UnmodifiableMutableSortedSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSortedSet<T> newWith(T... elements)
+    {
+        MutableSortedSet<T> result = TreeSortedSet.newSet(Comparators.reverseNaturalOrder());
+        IterableTestCase.addAllTo(elements, result);
+        return result.asUnmodifiable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTestCase.java
new file mode 100644
index 000000000..cf2a75473
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/sorted/UnmodifiableMutableSortedSetTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.sorted;
+
+import com.gs.collections.test.UnmodifiableMutableCollectionTestCase;
+import com.gs.collections.test.set.sorted.UnmodifiableSortedSetTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableMutableSortedSetTestCase extends UnmodifiableMutableCollectionTestCase, UnmodifiableSortedSetTestCase, MutableSortedSetTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableSortedSetTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIf()
+    {
+        UnmodifiableMutableCollectionTestCase.super.MutableCollection_removeIf();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableCollection_removeIfWith()
+    {
+        UnmodifiableMutableCollectionTestCase.super.MutableCollection_removeIfWith();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/strategy/UnifiedSetWithHashingStrategyTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/strategy/UnifiedSetWithHashingStrategyTest.java
new file mode 100644
index 000000000..db3437fd6
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/mutable/strategy/UnifiedSetWithHashingStrategyTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.mutable.strategy;
+
+import com.gs.collections.api.set.MutableSet;
+import com.gs.collections.impl.block.factory.HashingStrategies;
+import com.gs.collections.impl.set.strategy.mutable.UnifiedSetWithHashingStrategy;
+import com.gs.collections.test.IterableTestCase;
+import com.gs.collections.test.set.mutable.MutableSetTestCase;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnifiedSetWithHashingStrategyTest implements MutableSetTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableSet<T> newWith(T... elements)
+    {
+        MutableSet<T> result = UnifiedSetWithHashingStrategy.newSet(HashingStrategies.defaultStrategy());
+        IterableTestCase.addAllTo(elements, result);
+        return result;
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetIterableTestCase.java
new file mode 100644
index 000000000..564309c0d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetIterableTestCase.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.sorted;
+
+import java.util.NoSuchElementException;
+
+import com.gs.collections.api.set.sorted.MutableSortedSet;
+import com.gs.collections.api.set.sorted.SortedSetIterable;
+import com.gs.collections.impl.block.factory.Comparators;
+import com.gs.collections.impl.factory.SortedSets;
+import com.gs.collections.test.SortedIterableTestCase;
+import com.gs.collections.test.domain.A;
+import com.gs.collections.test.domain.B;
+import com.gs.collections.test.domain.C;
+import com.gs.collections.test.list.TransformsToListTrait;
+import com.gs.collections.test.set.SetIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface SortedSetIterableTestCase extends SetIterableTestCase, SortedIterableTestCase, TransformsToListTrait
+{
+    @Override
+    <T> SortedSetIterable<T> newWith(T... elements);
+
+    @Override
+    default <T> SortedSetIterable<T> getExpectedFiltered(T... elements)
+    {
+        return SortedSets.immutable.with(Comparators.reverseNaturalOrder(), elements);
+    }
+
+    @Override
+    default <T> MutableSortedSet<T> newMutableForFilter(T... elements)
+    {
+        return SortedSets.mutable.with(Comparators.reverseNaturalOrder(), elements);
+    }
+
+    @Test
+    default void SortedSetIterable_union()
+    {
+        SortedSetIterable<Integer> union = this.newWith(1, 2, 3).union(this.newWith(3, 4, 5));
+        assertEquals(SortedSets.immutable.with(Comparators.reverseNaturalOrder(), 5, 4, 3, 2, 1), union);
+    }
+
+    @Override
+    @Test(expected = NoSuchElementException.class)
+    default void RichIterable_getFirst_empty_null()
+    {
+        this.newWith().getFirst();
+    }
+
+    @Override
+    @Test(expected = NoSuchElementException.class)
+    default void RichIterable_getLast_empty_null()
+    {
+        this.newWith().getLast();
+    }
+
+    @Override
+    @Test
+    default void RichIterable_selectInstancesOf()
+    {
+        // Must test with two classes that are mutually Comparable
+
+        SortedSetIterable<A> numbers = this.<A>newWith(new C(4.0), new B(3), new C(2.0), new B(1));
+        assertEquals(this.<B>getExpectedFiltered(new B(3), new B(1)), numbers.selectInstancesOf(B.class));
+        assertEquals(this.getExpectedFiltered(new C(4.0), new B(3), new C(2.0), new B(1)), numbers.selectInstancesOf(A.class));
+    }
+
+    @Override
+    default void OrderedIterable_getFirst()
+    {
+        assertEquals(Integer.valueOf(3), this.newWith(3, 2, 1).getFirst());
+    }
+
+    @Override
+    default void OrderedIterable_getLast()
+    {
+        assertEquals(Integer.valueOf(1), this.newWith(3, 2, 1).getLast());
+    }
+
+    @Override
+    default void RichIterable_getFirst()
+    {
+        assertEquals(Integer.valueOf(3), this.newWith(3, 2, 1).getFirst());
+    }
+
+    @Override
+    default void RichIterable_getLast()
+    {
+        assertEquals(Integer.valueOf(1), this.newWith(3, 2, 1).getLast());
+    }
+
+    @Override
+    default void OrderedIterable_min()
+    {
+        // Cannot contain duplicates
+    }
+
+    @Override
+    default void OrderedIterable_max()
+    {
+        // Cannot contain duplicates
+    }
+
+    @Override
+    default void OrderedIterable_min_comparator()
+    {
+        // Cannot contain duplicates
+    }
+
+    @Override
+    default void OrderedIterable_max_comparator()
+    {
+        // Cannot contain duplicates
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetTestCase.java
new file mode 100644
index 000000000..6fd1c94bc
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/SortedSetTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.sorted;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.SortedSet;
+
+import com.gs.collections.test.CollectionTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public interface SortedSetTestCase extends CollectionTestCase
+{
+    @Override
+    <T> SortedSet<T> newWith(T... elements);
+
+    @Override
+    default boolean allowsDuplicates()
+    {
+        return false;
+    }
+
+    @Override
+    @Test
+    default void Iterable_next()
+    {
+        Set<Integer> iterable = this.newWith(3, 2, 1);
+
+        Iterator<Integer> iterator = iterable.iterator();
+        assertTrue(iterator.hasNext());
+        assertEquals(Integer.valueOf(3), iterator.next());
+        assertTrue(iterator.hasNext());
+        assertEquals(Integer.valueOf(2), iterator.next());
+        assertTrue(iterator.hasNext());
+        assertEquals(Integer.valueOf(1), iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        Iterable<Integer> iterable = this.newWith(3, 2, 1);
+        Iterator<Integer> iterator = iterable.iterator();
+        assertEquals(Integer.valueOf(3), iterator.next());
+        iterator.remove();
+        assertEquals(this.newWith(2, 1), iterable);
+    }
+
+    @Override
+    @Test
+    default void Collection_add()
+    {
+        Collection<Integer> collection = this.newWith(1, 2, 3);
+        assertFalse(collection.add(3));
+    }
+
+    @Override
+    @Test
+    default void Collection_size()
+    {
+        assertThat(this.newWith(3, 2, 1), hasSize(3));
+        assertThat(this.newWith(), hasSize(0));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/UnmodifiableSortedSetTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/UnmodifiableSortedSetTestCase.java
new file mode 100644
index 000000000..55e42505c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/set/sorted/UnmodifiableSortedSetTestCase.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.set.sorted;
+
+import com.gs.collections.test.UnmodifiableCollectionTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableSortedSetTestCase extends UnmodifiableCollectionTestCase, SortedSetTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableCollectionTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void Collection_add()
+    {
+        UnmodifiableCollectionTestCase.super.Collection_add();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/StackIterableTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/StackIterableTestCase.java
new file mode 100644
index 000000000..498f5b1f9
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/StackIterableTestCase.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack;
+
+import java.util.EmptyStackException;
+
+import com.gs.collections.api.RichIterable;
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.api.stack.StackIterable;
+import com.gs.collections.impl.block.factory.Procedures;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.impl.factory.Stacks;
+import com.gs.collections.test.OrderedIterableWithDuplicatesTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface StackIterableTestCase extends OrderedIterableWithDuplicatesTestCase, TransformsToStackTrait
+{
+    @Override
+    <T> StackIterable<T> newWith(T... elements);
+
+    @Override
+    default void newMutable_sanity()
+    {
+        // Cannot treat an ArrayStack as a MutableCollection
+    }
+
+    @Override
+    default <T> StackIterable<T> getExpectedFiltered(T... elements)
+    {
+        return Stacks.immutable.withReversed(elements);
+    }
+
+    @Override
+    default <T> MutableList<T> newMutableForFilter(T... elements)
+    {
+        return Lists.mutable.with(elements);
+    }
+
+    @Override
+    @Test
+    default void InternalIterable_forEach()
+    {
+        RichIterable<Integer> integers = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableStack<Integer> result = Stacks.mutable.with();
+        integers.forEach(Procedures.cast(result::push));
+        assertEquals(this.newWith(1, 2, 2, 3, 3, 3), result);
+    }
+
+    @Override
+    default void InternalIterable_forEachWith()
+    {
+        RichIterable<Integer> iterable = this.newWith(3, 3, 3, 2, 2, 1);
+        MutableStack<Integer> result = Stacks.mutable.with();
+        iterable.forEachWith((argument1, argument2) -> result.push(argument1 + argument2), 10);
+        assertEquals(this.getExpectedFiltered(11, 12, 12, 13, 13, 13), result);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getFirst_and_getLast()
+    {
+        assertThrows(UnsupportedOperationException.class, this.newWith()::getLast);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getFirst_empty_null()
+    {
+        assertThrows(EmptyStackException.class, this.newWith()::getFirst);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getLast_empty_null()
+    {
+        assertThrows(UnsupportedOperationException.class, this.newWith()::getLast);
+    }
+
+    @Override
+    @Test
+    default void RichIterable_getLast()
+    {
+        assertThrows(UnsupportedOperationException.class, this.newWith(3, 3, 3, 2, 2, 1)::getLast);
+    }
+
+    @Override
+    @Test
+    default void OrderedIterable_getLast()
+    {
+        assertThrows(UnsupportedOperationException.class, this.newWith(3, 3, 3, 2, 2, 1)::getLast);
+    }
+
+    @Test
+    default void StackIterable_peek()
+    {
+        assertEquals(Integer.valueOf(5), this.newWith(5, 1, 4, 2, 3).peek());
+    }
+
+    @Test(expected = EmptyStackException.class)
+    default void StackIterable_peek_throws()
+    {
+        this.newWith().peek();
+    }
+
+    @Test
+    default void StackIterable_peekAt()
+    {
+        assertEquals(Integer.valueOf(5), this.newWith(5, 1, 4, 2, 3).peekAt(0));
+        assertEquals(Integer.valueOf(1), this.newWith(5, 1, 4, 2, 3).peekAt(1));
+        assertEquals(Integer.valueOf(4), this.newWith(5, 1, 4, 2, 3).peekAt(2));
+        assertEquals(Integer.valueOf(2), this.newWith(5, 1, 4, 2, 3).peekAt(3));
+        assertEquals(Integer.valueOf(3), this.newWith(5, 1, 4, 2, 3).peekAt(4));
+    }
+
+    @Test
+    default void StackIterable_peekAt_throws()
+    {
+        StackIterable<Integer> stackIterable = this.newWith(5, 1, 4, 2, 3);
+        assertThrows(IllegalArgumentException.class, (Runnable) () -> stackIterable.peekAt(-1));
+        assertThrows(IllegalArgumentException.class, (Runnable) () -> stackIterable.peekAt(5));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/TransformsToStackTrait.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/TransformsToStackTrait.java
new file mode 100644
index 000000000..9086ff854
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/TransformsToStackTrait.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack;
+
+import com.gs.collections.api.list.MutableList;
+import com.gs.collections.api.list.primitive.MutableBooleanList;
+import com.gs.collections.api.list.primitive.MutableByteList;
+import com.gs.collections.api.list.primitive.MutableCharList;
+import com.gs.collections.api.list.primitive.MutableDoubleList;
+import com.gs.collections.api.list.primitive.MutableFloatList;
+import com.gs.collections.api.list.primitive.MutableIntList;
+import com.gs.collections.api.list.primitive.MutableLongList;
+import com.gs.collections.api.list.primitive.MutableShortList;
+import com.gs.collections.api.stack.StackIterable;
+import com.gs.collections.api.stack.primitive.BooleanStack;
+import com.gs.collections.api.stack.primitive.ByteStack;
+import com.gs.collections.api.stack.primitive.CharStack;
+import com.gs.collections.api.stack.primitive.DoubleStack;
+import com.gs.collections.api.stack.primitive.FloatStack;
+import com.gs.collections.api.stack.primitive.IntStack;
+import com.gs.collections.api.stack.primitive.LongStack;
+import com.gs.collections.api.stack.primitive.ShortStack;
+import com.gs.collections.impl.factory.Lists;
+import com.gs.collections.impl.factory.Stacks;
+import com.gs.collections.impl.factory.primitive.BooleanLists;
+import com.gs.collections.impl.factory.primitive.BooleanStacks;
+import com.gs.collections.impl.factory.primitive.ByteLists;
+import com.gs.collections.impl.factory.primitive.ByteStacks;
+import com.gs.collections.impl.factory.primitive.CharLists;
+import com.gs.collections.impl.factory.primitive.CharStacks;
+import com.gs.collections.impl.factory.primitive.DoubleLists;
+import com.gs.collections.impl.factory.primitive.DoubleStacks;
+import com.gs.collections.impl.factory.primitive.FloatLists;
+import com.gs.collections.impl.factory.primitive.FloatStacks;
+import com.gs.collections.impl.factory.primitive.IntLists;
+import com.gs.collections.impl.factory.primitive.IntStacks;
+import com.gs.collections.impl.factory.primitive.LongLists;
+import com.gs.collections.impl.factory.primitive.LongStacks;
+import com.gs.collections.impl.factory.primitive.ShortLists;
+import com.gs.collections.impl.factory.primitive.ShortStacks;
+import com.gs.collections.impl.list.mutable.primitive.BooleanArrayList;
+import com.gs.collections.impl.list.mutable.primitive.ByteArrayList;
+import com.gs.collections.impl.list.mutable.primitive.CharArrayList;
+import com.gs.collections.impl.list.mutable.primitive.DoubleArrayList;
+import com.gs.collections.impl.list.mutable.primitive.FloatArrayList;
+import com.gs.collections.impl.list.mutable.primitive.IntArrayList;
+import com.gs.collections.impl.list.mutable.primitive.LongArrayList;
+import com.gs.collections.impl.list.mutable.primitive.ShortArrayList;
+import com.gs.collections.test.RichIterableTestCase;
+
+public interface TransformsToStackTrait extends RichIterableTestCase
+{
+    @Override
+    default <T> StackIterable<T> getExpectedTransformed(T... elements)
+    {
+        return Stacks.immutable.withReversed(elements);
+    }
+
+    @Override
+    default <T> MutableList<T> newMutableForTransform(T... elements)
+    {
+        return Lists.mutable.with(elements);
+    }
+
+    @Override
+    default MutableBooleanList newBooleanForTransform(boolean... elements)
+    {
+        return new BooleanArrayList(elements);
+    }
+
+    @Override
+    default MutableByteList newByteForTransform(byte... elements)
+    {
+        return new ByteArrayList(elements);
+    }
+
+    @Override
+    default MutableCharList newCharForTransform(char... elements)
+    {
+        return new CharArrayList(elements);
+    }
+
+    @Override
+    default MutableDoubleList newDoubleForTransform(double... elements)
+    {
+        return new DoubleArrayList(elements);
+    }
+
+    @Override
+    default MutableFloatList newFloatForTransform(float... elements)
+    {
+        return new FloatArrayList(elements);
+    }
+
+    @Override
+    default MutableIntList newIntForTransform(int... elements)
+    {
+        return new IntArrayList(elements);
+    }
+
+    @Override
+    default MutableLongList newLongForTransform(long... elements)
+    {
+        return new LongArrayList(elements);
+    }
+
+    @Override
+    default MutableShortList newShortForTransform(short... elements)
+    {
+        return new ShortArrayList(elements);
+    }
+
+    @Override
+    default BooleanStack getExpectedBoolean(boolean... elements)
+    {
+        return BooleanStacks.immutable.withAllReversed(BooleanLists.immutable.with(elements));
+    }
+
+    @Override
+    default ByteStack getExpectedByte(byte... elements)
+    {
+        return ByteStacks.immutable.withAllReversed(ByteLists.immutable.with(elements));
+    }
+
+    @Override
+    default CharStack getExpectedChar(char... elements)
+    {
+        return CharStacks.immutable.withAllReversed(CharLists.immutable.with(elements));
+    }
+
+    @Override
+    default DoubleStack getExpectedDouble(double... elements)
+    {
+        return DoubleStacks.immutable.withAllReversed(DoubleLists.immutable.with(elements));
+    }
+
+    @Override
+    default FloatStack getExpectedFloat(float... elements)
+    {
+        return FloatStacks.immutable.withAllReversed(FloatLists.immutable.with(elements));
+    }
+
+    @Override
+    default IntStack getExpectedInt(int... elements)
+    {
+        return IntStacks.immutable.withAllReversed(IntLists.immutable.with(elements));
+    }
+
+    @Override
+    default LongStack getExpectedLong(long... elements)
+    {
+        return LongStacks.immutable.withAllReversed(LongLists.immutable.with(elements));
+    }
+
+    @Override
+    default ShortStack getExpectedShort(short... elements)
+    {
+        return ShortStacks.immutable.withAllReversed(ShortLists.immutable.with(elements));
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTest.java
new file mode 100644
index 000000000..12015e36c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.immutable;
+
+import com.gs.collections.api.stack.ImmutableStack;
+import com.gs.collections.impl.stack.mutable.ArrayStack;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ImmutableStackTest implements ImmutableStackTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> ImmutableStack<T> newWith(T... elements)
+    {
+        return ArrayStack.newStackFromTopToBottom(elements).toImmutable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTestCase.java
new file mode 100644
index 000000000..1a838c99a
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/immutable/ImmutableStackTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.immutable;
+
+import java.util.EmptyStackException;
+import java.util.Iterator;
+
+import com.gs.collections.api.stack.ImmutableStack;
+import com.gs.collections.impl.factory.Stacks;
+import com.gs.collections.test.stack.StackIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface ImmutableStackTestCase extends StackIterableTestCase
+{
+    @Override
+    <T> ImmutableStack<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        ImmutableStack<Integer> stack = this.newWith(3, 3, 3, 2, 2, 1);
+        Iterator<Integer> iterator = stack.iterator();
+        iterator.next();
+        assertThrows(UnsupportedOperationException.class, iterator::remove);
+    }
+
+    @Test
+    default void MutableStack_pop()
+    {
+        ImmutableStack<Integer> immutableStack = this.newWith(5, 1, 4, 2, 3);
+        ImmutableStack<Integer> poppedStack = immutableStack.pop();
+        assertEquals(Stacks.immutable.withReversed(1, 4, 2, 3), poppedStack);
+        assertEquals(Stacks.immutable.withReversed(5, 1, 4, 2, 3), immutableStack);
+    }
+
+    @Test
+    default void ImmutableStack_pop_throws()
+    {
+        ImmutableStack<Integer> immutableStack = this.newWith(5, 1, 4, 2, 3);
+        ImmutableStack<Integer> emptyStack = immutableStack.pop().pop().pop().pop().pop();
+        assertEquals(Stacks.immutable.with(), emptyStack);
+        assertThrows(EmptyStackException.class, (Runnable) emptyStack::pop);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/ArrayStackTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/ArrayStackTest.java
new file mode 100644
index 000000000..7a3ace01b
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/ArrayStackTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.mutable;
+
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.impl.stack.mutable.ArrayStack;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class ArrayStackTest implements MutableStackTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableStack<T> newWith(T... elements)
+    {
+        return ArrayStack.newStackFromTopToBottom(elements);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/MutableStackTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/MutableStackTestCase.java
new file mode 100644
index 000000000..fcb82e80d
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/MutableStackTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.mutable;
+
+import java.util.EmptyStackException;
+import java.util.Iterator;
+
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.impl.factory.Stacks;
+import com.gs.collections.test.stack.StackIterableTestCase;
+import org.junit.Test;
+
+import static com.gs.collections.impl.test.Verify.assertThrows;
+import static com.gs.collections.test.IterableTestCase.assertEquals;
+
+public interface MutableStackTestCase extends StackIterableTestCase
+{
+    @Override
+    <T> MutableStack<T> newWith(T... elements);
+
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        MutableStack<Integer> stack = this.newWith(3, 3, 3, 2, 2, 1);
+        Iterator<Integer> iterator = stack.iterator();
+        iterator.next();
+        assertThrows(UnsupportedOperationException.class, iterator::remove);
+    }
+
+    @Test
+    default void MutableStack_pop()
+    {
+        MutableStack<Integer> mutableStack = this.newWith(5, 1, 4, 2, 3);
+        assertEquals(Integer.valueOf(5), mutableStack.pop());
+        assertEquals(Stacks.immutable.withReversed(1, 4, 2, 3), mutableStack);
+    }
+
+    @Test
+    default void MutableStack_pop_throws()
+    {
+        MutableStack<Integer> mutableStack = this.newWith(5, 1, 4, 2, 3);
+        assertEquals(Integer.valueOf(5), mutableStack.pop());
+        assertEquals(Integer.valueOf(1), mutableStack.pop());
+        assertEquals(Integer.valueOf(4), mutableStack.pop());
+        assertEquals(Integer.valueOf(2), mutableStack.pop());
+        assertEquals(Integer.valueOf(3), mutableStack.pop());
+        assertThrows(EmptyStackException.class, (Runnable) mutableStack::pop);
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/SynchronizedMutableStackTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/SynchronizedMutableStackTest.java
new file mode 100644
index 000000000..2bacbb05c
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/SynchronizedMutableStackTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.mutable;
+
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.impl.stack.mutable.ArrayStack;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class SynchronizedMutableStackTest implements MutableStackTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableStack<T> newWith(T... elements)
+    {
+        return ArrayStack.newStackFromTopToBottom(elements).asSynchronized();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTest.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTest.java
new file mode 100644
index 000000000..52da58202
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.mutable;
+
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.impl.stack.mutable.ArrayStack;
+import com.gs.junit.runners.Java8Runner;
+import org.junit.runner.RunWith;
+
+@RunWith(Java8Runner.class)
+public class UnmodifiableMutableStackTest implements UnmodifiableMutableStackTestCase
+{
+    @SafeVarargs
+    @Override
+    public final <T> MutableStack<T> newWith(T... elements)
+    {
+        return ArrayStack.newStackFromTopToBottom(elements).asUnmodifiable();
+    }
+}
diff --git a/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTestCase.java b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTestCase.java
new file mode 100644
index 000000000..4936ff8e2
--- /dev/null
+++ b/unit-tests-java8/src/test/java/com/gs/collections/test/stack/mutable/UnmodifiableMutableStackTestCase.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gs.collections.test.stack.mutable;
+
+import com.gs.collections.api.stack.MutableStack;
+import com.gs.collections.test.UnmodifiableIterableTestCase;
+import org.junit.Test;
+
+public interface UnmodifiableMutableStackTestCase extends MutableStackTestCase, UnmodifiableIterableTestCase
+{
+    @Override
+    @Test
+    default void Iterable_remove()
+    {
+        UnmodifiableIterableTestCase.super.Iterable_remove();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableStack_pop()
+    {
+        MutableStack<Integer> mutableStack = this.newWith(5, 1, 4, 2, 3);
+        mutableStack.pop();
+    }
+
+    @Override
+    @Test(expected = UnsupportedOperationException.class)
+    default void MutableStack_pop_throws()
+    {
+        MutableStack<Integer> mutableStack = this.newWith();
+        mutableStack.pop();
+    }
+}
diff --git a/unit-tests-java8/unit-tests-java8.iml b/unit-tests-java8/unit-tests-java8.iml
new file mode 100644
index 000000000..e97d9f26e
--- /dev/null
+++ b/unit-tests-java8/unit-tests-java8.iml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="gs-collections-api" scope="TEST" />
+    <orderEntry type="module" module-name="gs-collections" scope="TEST" />
+    <orderEntry type="module" module-name="gs-collections-testutils" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="module" module-name="junit-trait-runner" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-nop:1.7.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/unit-tests/pom.xml b/unit-tests/pom.xml
index 7f23bfd51..62e55a0e8 100644
--- a/unit-tests/pom.xml
+++ b/unit-tests/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2014 Goldman Sachs.
+  ~ Copyright 2015 Goldman Sachs.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -112,6 +112,11 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <J-Xmx2048m />
+                    </compilerArguments>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
 
diff --git a/version.properties b/version.properties
index c98f3ace7..9c5130a73 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Goldman Sachs.
+# Copyright 2015 Goldman Sachs.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 ivy.version=2.3.0
-junit.version=4.11
+junit.version=4.12
 jcip.version=1.0
 slf4j.version=1.7.7
 scala.version=2.11.3