diff --git a/pykd/module.h b/pykd/module.h
index 81d22ca..645fc6b 100644
--- a/pykd/module.h
+++ b/pykd/module.h
@@ -105,7 +105,7 @@ public:
 
     python::list enumSymbols( const std::string  &mask = "*" );
 
-    python::list enumTypes( const std::string  &mask = "*" );
+    python::list enumTypes( const std::string  &mask = std::string() );
 
     std::string print();
 
diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py
index 155fe31..152b125 100644
--- a/test/scripts/moduletest.py
+++ b/test/scripts/moduletest.py
@@ -68,7 +68,7 @@ class ModuleTest( unittest.TestCase ):
         self.assertEqual( 2, displacement )
         fileName, lineNo, displacement = pykd.getSourceLine()
         self.assertEqual( 624, lineNo )
-        
+
     def testEnumSymbols( self ):
         lst = target.module.enumSymbols()
         self.assertNotEqual( 0, len(lst) )
@@ -82,14 +82,21 @@ class ModuleTest( unittest.TestCase ):
         self.assertNotEqual( 0, len(lst) )
         lst = target.module.enumSymbols( "classChild" )
         self.assertEqual( 0, len(lst) )
-          
 
     def testEnumTypes( self ):
-        lst = target.module.enumTypes()
-        self.assertNotEqual( 0, len(lst) )
-        lst = target.module.enumTypes("*class*")
-        self.assertEqual( 2, len(lst) )
-        self.assertTrue( "classChild" in lst )
-        self.assertTrue( "classBase" in lst )
-        lst = target.module.enumTypes("hello*Str")
-        self.assertEqual( 0, len(lst) )
+        lst1 = target.module.enumTypes()
+        self.assertNotEqual( 0, len(lst1) )
+
+        self.assertTrue( "classChild" in lst1 )
+        self.assertTrue( "classBase" in lst1 )
+        self.assertTrue( "structTest" in lst1 )
+
+        lst2 = target.module.enumTypes("*class*")
+        self.assertEqual( 2, len(lst2) )
+        self.assertTrue( len(lst1) > len(lst2) )
+
+        self.assertTrue( "classChild" in lst2 )
+        self.assertTrue( "classBase" in lst2 )
+
+        lst3 = target.module.enumTypes("hello*Str")
+        self.assertEqual( 0, len(lst3) )