Index: vhUnitTest/TECH/DynamicIterator/TestOnFiltering.cls.xml
===================================================================
diff -u -r2301 -r2532
--- vhUnitTest/TECH/DynamicIterator/TestOnFiltering.cls.xml	(.../TestOnFiltering.cls.xml)	(revision 2301)
+++ vhUnitTest/TECH/DynamicIterator/TestOnFiltering.cls.xml	(.../TestOnFiltering.cls.xml)	(revision 2532)
@@ -76,6 +76,33 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Remove the last item, combined with filter -&gt; remove all">
+<Implementation><![CDATA[
+	Set Filter = ##class(vhTest.Mock.AX.Uitgaand.AKP.LeverancierBTWnummer.impl.GeldigeBTWnummerFilter).%New()
+	Do Filter.IndienMethodCall("IsValid","A").DanReturn($$$False)
+	Do Filter.IndienMethodCall("IsValid","B").DanReturn($$$False)
+	Do Filter.IndienMethodCall("IsValid","C").DanReturn($$$False)
+	Set Iterator = ##class(TECH.DynamicIterator).%New(..GetMainItemIterator(),,Filter)
+	
+	Do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Remove the last item, by Filter (not FilterStatement)">
+<Implementation><![CDATA[
+	Set Filter = ##class(vhTest.Mock.AX.Uitgaand.AKP.LeverancierBTWnummer.impl.GeldigeBTWnummerFilter).%New()
+	Do Filter.IndienMethodCall("IsValid","A").DanReturn($$$True)
+	Do Filter.IndienMethodCall("IsValid","B").DanReturn($$$True)
+	Do Filter.IndienMethodCall("IsValid","C").DanReturn($$$False)
+	Set Iterator = ##class(TECH.DynamicIterator).%New(..GetMainItemIterator(),,Filter)
+	
+	Do $$$AssertTrue(Iterator.HasNext())
+	Do $$$AssertEquals(Iterator.Next(),"A")
+	Do $$$AssertEquals(Iterator.Next(),"B")
+	Do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
 <Method name="GetMainItemIterator">
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>