diff --git a/test/scripts/arm64dumptest.py b/test/scripts/arm64dumptest.py
index e7894af..8e3ff76 100644
--- a/test/scripts/arm64dumptest.py
+++ b/test/scripts/arm64dumptest.py
@@ -6,7 +6,7 @@ import os
 class ARM64DumpTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm64_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm64_mem\win10_arm64_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
     def tearDown(self):
@@ -14,41 +14,41 @@ class ARM64DumpTest(unittest.TestCase):
 
     def testArm64(self):
         # dbgmem
-        self.assertEqual( 0, pykd.addr64(0) )
+        self.assertEqual( 0, pykd.addr64(0) )
         self.assertEqual( 0x80000000, pykd.addr64(0x80000000) )
 
         # dbgeng
-        self.assertEqual( pykd.CPUType.ARM64, pykd.getCPUType() )
-        self.assertEqual( pykd.CPUType.ARM64, pykd.getCPUMode() )
-
-        self.assertTrue( pykd.is64bitSystem() )
-        self.assertEqual( 8, pykd.ptrSize() )
-
+        self.assertEqual( pykd.CPUType.ARM64, pykd.getCPUType() )
+        self.assertEqual( pykd.CPUType.ARM64, pykd.getCPUMode() )
+
+        self.assertTrue( pykd.is64bitSystem() )
+        self.assertEqual( 8, pykd.ptrSize() )
+
         self.assertEqual( pykd.expr("@$retreg"), pykd.reg("x0") )
 
         # typeinfo
-        self.assertEqual( 8, pykd.typeInfo("nt!_IRP*").size() )
-
+        self.assertEqual( 8, pykd.typeInfo("nt!_IRP*").size() )
+
         # symexport
-        self.assertEqual( pykd.expr("clipsp!ClipSpInitialize"), pykd.module("clipsp").ClipSpInitialize )
-
-        # cpu context
-        cpu = pykd.cpu()
-        self.assertEqual( pykd.expr("@$ip"), cpu.ip )
-        self.assertEqual( pykd.expr("@$csp"), cpu.sp )
-        self.assertEqual( pykd.expr("@fp"), cpu.fp )
-
+        self.assertEqual( pykd.expr("clipsp!ClipSpInitialize"), pykd.module("clipsp").ClipSpInitialize )
+
+        # cpu context
+        cpu = pykd.cpu()
+        self.assertEqual( pykd.expr("@$ip"), cpu.ip )
+        self.assertEqual( pykd.expr("@$csp"), cpu.sp )
+        self.assertEqual( pykd.expr("@fp"), cpu.fp )
+
         # stack
-        stack = pykd.getStack()
-
-        self.assertTrue( len(stack) > 11 )
-
-        self.assertEqual( "nt!KeBugCheck2", pykd.findSymbol(stack[0].ip, False) )
-
-        self.assertEqual( "Wdf01000!FxRequest::CompleteInternal", pykd.findSymbol(stack[11].ip, False) )
-        self.assertEqual( 0, stack[11].getParam("Status") )
-        self.assertEqual( 0xffffc18eaa798940, stack[11].getLocal("irp").m_Irp )
+        stack = pykd.getStack()
+
+        self.assertTrue( len(stack) > 11 )
+
+        self.assertEqual( "nt!KeBugCheck2", pykd.findSymbol(stack[0].ip, False) )
+
+        self.assertEqual( "Wdf01000!FxRequest::CompleteInternal", pykd.findSymbol(stack[11].ip, False) )
+        self.assertEqual( 0, stack[11].getParam("Status") )
+        self.assertEqual( 0xffffc18eaa798940, stack[11].getLocal("irp").m_Irp )
+
+
 
-
-
 
diff --git a/test/scripts/armdumptest.py b/test/scripts/armdumptest.py
index 9043a5b..e6d08cc 100644
--- a/test/scripts/armdumptest.py
+++ b/test/scripts/armdumptest.py
@@ -6,7 +6,7 @@ import os
 class ARMDumpTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm_rpi3_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm_rpi3_mem\win10_arm_rpi3_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
     def tearDown(self):
diff --git a/test/scripts/taggedtest.py b/test/scripts/taggedtest.py
index 49d7a4a..0fd099e 100644
--- a/test/scripts/taggedtest.py
+++ b/test/scripts/taggedtest.py
@@ -6,7 +6,7 @@ import os
 class TaggedTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win8_x64_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win8_x64_mem\win8_x64_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
         self._existing_id = "D03DC06F-D88E-44C5-BA2A-FAE035172D19"
diff --git a/test/scripts/typeinfo.py b/test/scripts/typeinfo.py
index eae9ba3..26156ec 100644
--- a/test/scripts/typeinfo.py
+++ b/test/scripts/typeinfo.py
@@ -356,7 +356,7 @@ class TypeInfoTest( unittest.TestCase ):
         typeProvider = pykd.getTypeInfoProviderFromPdb(pdb)
         self.assertEqual("structTest", typeProvider.getTypeByName("structTest").name())
         self.assertEqual("structTest", typeProvider.structTest.name())
-        self.assertEqual(22, len(list(typeProvider.typeIterator("*struct*"))))
+        self.assertEqual(13, len(list(typeProvider.typeIterator("*struct*"))))
 
     def testScopeName(self):
         self.assertEqual( target.module.name(), pykd.typeInfo( "structTest" ).scopeName() )