Index: vhUnitTest/TECH/GlobalIterator/Test.cls.xml
===================================================================
diff -u -r1240 -r1244
--- vhUnitTest/TECH/GlobalIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 1240)
+++ vhUnitTest/TECH/GlobalIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 1244)
@@ -41,14 +41,16 @@
 
 <Method name="TestGlobalMeerdereWaarden">
 <Implementation><![CDATA[
-	Do ..MaakSimpeleGlobal()
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
+	Set @..#Global@(2) = "Waarde 2"
 	
 	Do ..InitGlobalIterator()
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
 	Do $$$AssertTrue(..Iterator.HasNext())
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(1))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
 	Do $$$AssertTrue(..Iterator.HasNext())
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(2))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 2")
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -59,7 +61,7 @@
 	Set @..#Global@(0,0) = "SubWaarde 1"
 	
 	Do ..InitGlobalIterator()
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -70,30 +72,32 @@
 	Set @..#Global@(0,0) = "SubWaarde 1"
 	
 	Do ..InitGlobalIterator(..#Global_"(0)")
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0,0))
+	Do $$$AssertEquals(..Iterator.Next(), "SubWaarde 1")
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
 
 <Method name="TestGlobalMetIngesteldeBeginPositie">
 <Implementation><![CDATA[
-	Do ..MaakSimpeleGlobal()
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
 	
 	Do ..InitGlobalIterator(,1,)
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(1))
-	Do $$$AssertTrue(..Iterator.HasNext())
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(2))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
 
 <Method name="TestGlobalMetIngesteldeEindPositie">
 <Implementation><![CDATA[
-	Do ..MaakSimpeleGlobal()
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
+	Set @..#Global@(2) = "Waarde 2"
+	
 	Do ..InitGlobalIterator(,,2)
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
 	Do $$$AssertTrue(..Iterator.HasNext())
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(1))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -106,22 +110,55 @@
 	Set @..#Global@(0) = "Waarde 1"
 	
 	Do ..InitGlobalIterator()
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
 	Do $$$AssertFalse(..Iterator.HasNext())
 	Do ..Iterator.Next()
 ]]></Implementation>
 </Method>
 
+<Method name="TestStartPositieNietBestaande">
+<Implementation><![CDATA[
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(2) = "Waarde 2"
+	Do ..InitGlobalIterator(,1,)
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 2")
+	Do $$$AssertFalse(..Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="TestEindPositieNietBestaande">
+<Implementation><![CDATA[
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(2) = "Waarde 2"
+	Do ..InitGlobalIterator(,,1)
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertFalse(..Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="TestEindPositieGroterDanEindPositieInLijst">
+<Implementation><![CDATA[
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
+	Do ..InitGlobalIterator(,,5)
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertTrue(..Iterator.HasNext())
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertFalse(..Iterator.HasNext())
+]]></Implementation>
+</Method>
+
 <Method name="TestReset">
 <Implementation><![CDATA[
-	Do ..MaakSimpeleGlobal()
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
 	Do ..InitGlobalIterator()
 	
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do ..Iterator.Reset()
 	Do $$$AssertTrue(..Iterator.HasNext())
-	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
 ]]></Implementation>
 </Method>
 
@@ -133,15 +170,6 @@
 	Do $$$AssertTrue(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
-
-<Method name="MaakSimpeleGlobal">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set @..#Global@(0) = "Waarde 1"
-	Set @..#Global@(1) = "Waarde 2"
-	Set @..#Global@(2) = "Waarde 3"
-]]></Implementation>
-</Method>
 </Class>