Index: AX/common/impl/FileWriter.cls.xml
===================================================================
diff -u -r34870 -r35031
--- AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 34870)
+++ AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 35031)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.common.impl.FileWriter">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="FileWriter">
 <Type>TECH.File.FileWriter</Type>
@@ -15,7 +15,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FileWriter = ##class(TECH.File.impl.FileWriter).%New()
+	set ..FileWriter = $$$Inject(FileWriter,##class(TECH.File.impl.FileWriter).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -57,9 +57,7 @@
 
 <Method name="WriteStream">
 <FormalSpec>Stream:%Stream</FormalSpec>
-<Implementation><![CDATA[
-	
-	do ..FileWriter.WriteStream(Stream)
+<Implementation><![CDATA[	do ..FileWriter.WriteStream(Stream)
 ]]></Implementation>
 </Method>
 
@@ -82,6 +80,12 @@
 	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
 ]]></Implementation>
 </Method>
+
+<Method name="GetStream">
+<ReturnType>%GlobalCharacterStream</ReturnType>
+<Implementation><![CDATA[	quit ..FileWriter.GetStream()
+]]></Implementation>
+</Method>
 </Class>