Index: Tools/Test/Matchers.cls.xml
===================================================================
diff -u -r3337 -r3400
--- Tools/Test/Matchers.cls.xml	(.../Matchers.cls.xml)	(revision 3337)
+++ Tools/Test/Matchers.cls.xml	(.../Matchers.cls.xml)	(revision 3400)
@@ -50,6 +50,13 @@
 <Implementation><![CDATA[	Quit ##class(Tools.Mock.ArgumentMatchers.StringContainsMatcher).%New(Argument)
 ]]></Implementation>
 </Method>
+
+<Method name="TypeOf">
+<FormalSpec>ClassName:%String</FormalSpec>
+<ReturnType>Tools.Mock.ArgumentMatcher</ReturnType>
+<Implementation><![CDATA[	Quit ##class(Tools.Mock.ArgumentMatchers.TypeOfMatcher).%New(ClassName)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: Tools/Mock/ArgumentMatchers/TypeOfMatcher.cls.xml
===================================================================
diff -u
--- Tools/Mock/ArgumentMatchers/TypeOfMatcher.cls.xml	(revision 0)
+++ Tools/Mock/ArgumentMatchers/TypeOfMatcher.cls.xml	(revision 3400)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Mock.ArgumentMatchers.TypeOfMatcher">
+<Super>TECH.RegisteredObject,Tools.Mock.ArgumentMatcher</Super>
+
+<Property name="VerwachtObject">
+<Type>%Base</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ClassName">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ClassName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..ClassName = ClassName
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Matches">
+<FormalSpec>VerwachtObject:%Base</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set ..VerwachtObject = VerwachtObject
+	
+	Quit VerwachtObject.%IsA(..ClassName)
+]]></Implementation>
+</Method>
+
+<Method name="OmschrijfMismatch">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..VerwachtObject _ " is niet van het type '" _ ..ClassName _ "'"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>