Index: Tools/Test/Matchers.cls.xml
===================================================================
diff -u -r2528 -r2848
--- Tools/Test/Matchers.cls.xml	(.../Matchers.cls.xml)	(revision 2528)
+++ Tools/Test/Matchers.cls.xml	(.../Matchers.cls.xml)	(revision 2848)
@@ -11,9 +11,15 @@
 </Method>
 
 <Method name="Stream">
-<FormalSpec>Stream:%Stream.Object</FormalSpec>
+<FormalSpec>Stream:%CacheString</FormalSpec>
 <ReturnType>Tools.Mock.ArgumentMatcher</ReturnType>
-<Implementation><![CDATA[	quit ##class(Tools.Mock.ArgumentMatchers.StreamMatcher).%New(Stream)
+<Implementation><![CDATA[
+	if $$$Not($IsObject(Stream)) {
+		Set tmpStream = ##class(%GlobalCharacterStream).%New()
+		Do tmpStream.Write(Stream)
+		quit ##class(Tools.Mock.ArgumentMatchers.StreamMatcher).%New(tmpStream)
+	} 
+	quit ##class(Tools.Mock.ArgumentMatchers.StreamMatcher).%New(Stream)
 ]]></Implementation>
 </Method>