Index: vhTest/Fake/TECH/File/FileReader.cls.xml
===================================================================
diff -u -r2401 -r2525
--- vhTest/Fake/TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2401)
+++ vhTest/Fake/TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2525)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.File.FileReader">
-<Super>TECH.File.FileReader,TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.File.FileReader</Super>
 
-<Property name="FakeList">
-<Type>TECH.ListbuildIterator</Type>
+<Property name="Stream">
+<Type>%Stream.Object</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FakeList:%List=""</FormalSpec>
+<FormalSpec>Stream:%Stream.Object=""</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FakeList = ##class(TECH.ListbuildIterator).%New(FakeList)
+	set ..Stream = $$$Inject(Stream,##class(%GlobalCharacterStream).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefStream">
 <ReturnType>%FileCharacterStream</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[	Quit ..Stream
 ]]></Implementation>
 </Method>
 
 <Method name="Close">
-<Implementation><![CDATA[	Do ..FakeList.%Close()
+<Implementation><![CDATA[	Do ..Stream.%Close()
 ]]></Implementation>
 </Method>
 
 <Method name="ReadLine">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..FakeList.Next()
+<Implementation><![CDATA[	Quit ..Stream.ReadLine()
 ]]></Implementation>
 </Method>
 
-<Method name="HasNextLine">
+<Method name="AtEnd">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..FakeList.HasNext()
+<Implementation><![CDATA[	Quit ..Stream.AtEnd
 ]]></Implementation>
 </Method>
 
-<Method name="AtEnd">
+<Method name="HasNextLine">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit '..FakeList.HasNext()
+<Implementation><![CDATA[	quit '..AtEnd()
 ]]></Implementation>
 </Method>
 </Class>