diff --git a/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java b/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
index c9f0cc97..f670a2e7 100644
--- a/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
+++ b/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
@@ -118,6 +118,14 @@ public abstract class BaseIntCollectionTest extends BaseIntIterableTest
 		Assert.assertTrue(collection.removeAll(Arrays.asList(IntArrays.wrap(CONTAINS_ARRAY))));
 	}
 	
+	@Test
+	public void testRemoveAllListener() {
+		if(!getValidCollectionTests().contains(CollectionTest.REMOVE_ALL_LISTENER)) return;
+		IntCollection collection = create(TEST_ARRAY);
+		Assert.assertTrue(collection.removeAll(create(CONTAINS_ARRAY), T -> {}));
+		Assert.assertFalse(collection.removeAll(create(CONTAINS_ARRAY), T -> Assert.assertTrue(false)));
+	}
+	
 	@Test
 	public void testRetainAll() {
 		if(!getValidCollectionTests().contains(CollectionTest.RETAIN_ALL)) return;
@@ -135,6 +143,23 @@ public abstract class BaseIntCollectionTest extends BaseIntIterableTest
 		Assert.assertTrue(collection.isEmpty());
 	}
 	
+	@Test
+	public void testRetainAllListener() {
+		if(!getValidCollectionTests().contains(CollectionTest.RETAIN_ALL_LISTENER)) return;
+		IntCollection collection = create(TEST_ARRAY);
+		IntCollection retained = create(CONTAINS_ARRAY);
+		Assert.assertTrue(collection.retainAll(retained, T -> {}));
+		Assert.assertFalse(collection.retainAll(retained, T -> Assert.assertTrue(false)));
+		Assert.assertEquals(CONTAINS_ARRAY.length, collection.size());
+		int[] retainedArray = retained.toIntArray();
+		int[] collectionArray = collection.toIntArray();
+		IntArrays.stableSort(retainedArray);
+		IntArrays.stableSort(collectionArray);
+		Assert.assertArrayEquals(retainedArray, collectionArray);
+		collection.retainAll(IntCollections.EMPTY, T -> {});
+		Assert.assertTrue(collection.isEmpty());
+	}
+	
 	@Test
 	public void testToArray() {
 		if(!getValidCollectionTests().contains(CollectionTest.TO_ARRAY)) return;
diff --git a/src/test/java/speiger/src/collections/ints/base/BaseIntListTest.java b/src/test/java/speiger/src/collections/ints/base/BaseIntListTest.java
index f903da8f..702b8618 100644
--- a/src/test/java/speiger/src/collections/ints/base/BaseIntListTest.java
+++ b/src/test/java/speiger/src/collections/ints/base/BaseIntListTest.java
@@ -64,6 +64,16 @@ public abstract class BaseIntListTest extends BaseIntCollectionTest
 		for(int i = 0;i<ADD_ARRAY.length;i++) Assert.assertEquals(ADD_ARRAY[i], list.getInt(i));
 	}
 	
+	@Test
+	public void testSpecialAdd() {
+		if(getValidListTests().contains(ListTest.ADD_SPECIAL)) return;
+		IntList list = create(TEST_ARRAY);
+		Assert.assertFalse(list.addIfAbsent(50));
+		Assert.assertTrue(list.addIfPresent(50));
+		Assert.assertTrue(list.addIfAbsent(150));
+		Assert.assertFalse(list.addIfAbsent(150));
+	}
+	
 	@Test
 	@SuppressWarnings("deprecation")	
 	public void testIndex() {
@@ -173,6 +183,17 @@ public abstract class BaseIntListTest extends BaseIntCollectionTest
 		}
 	}
 	
+	@Test
+	public void testSwapRemove() {
+		if(getValidListTests().contains(ListTest.REMOVE_SWAP)) return;
+		IntList list = create(TEST_ARRAY);
+		Assert.assertEquals(TEST_ARRAY[50], list.swapRemove(50));
+		Assert.assertEquals(TEST_ARRAY[TEST_ARRAY.length-1], list.getInt(50));
+		list = create(TEST_ARRAY);
+		Assert.assertTrue(list.swapRemoveInt(50));
+		Assert.assertFalse(list.swapRemoveInt(50));
+	}
+	
 	@Test
 	public void testListIterator() {
 		if(getValidListTests().contains(ListTest.LIST_ITERATOR)) return;
diff --git a/src/test/java/speiger/src/collections/tests/CollectionTest.java b/src/test/java/speiger/src/collections/tests/CollectionTest.java
index 6d1a4af2..db9c0b11 100644
--- a/src/test/java/speiger/src/collections/tests/CollectionTest.java
+++ b/src/test/java/speiger/src/collections/tests/CollectionTest.java
@@ -11,7 +11,9 @@ public enum CollectionTest
 	REMOVE,
 	REMOVE_IF,
 	REMOVE_ALL,
+	REMOVE_ALL_LISTENER,
 	RETAIN_ALL,
+	RETAIN_ALL_LISTENER,
 	TO_ARRAY,
 	CLEAR,
 	WRAPPER,
diff --git a/src/test/java/speiger/src/collections/tests/ListTest.java b/src/test/java/speiger/src/collections/tests/ListTest.java
index 76c01f37..f2411f6e 100644
--- a/src/test/java/speiger/src/collections/tests/ListTest.java
+++ b/src/test/java/speiger/src/collections/tests/ListTest.java
@@ -8,6 +8,7 @@ public enum ListTest
 	ADD_INDEX_COLLECTION,
 	ADD_INDEX_LIST,
 	ADD_ELEMENTS,
+	ADD_SPECIAL,
 	INDEX,
 	LAST_INDEX,
 	GET,
@@ -17,6 +18,7 @@ public enum ListTest
 	SORT,
 	REPLACE,
 	REMOVE,
+	REMOVE_SWAP,
 	REMOVE_ELEMENTS,
 	EXTRACT_ELEMENTS,
 	LIST_ITERATOR,