diff --git a/pykd_bootstrapper/version.h b/pykd_bootstrapper/version.h
index bdad861..5be7b80 100644
--- a/pykd_bootstrapper/version.h
+++ b/pykd_bootstrapper/version.h
@@ -3,7 +3,7 @@
 #define PYKDEXT_VERSION_MAJOR      1
 #define PYKDEXT_VERSION_MINOR      0
 #define PYKDEXT_VERSION_SUBVERSION 1
-#define PYKDEXT_VERSION_BUILDNO    5
+#define PYKDEXT_VERSION_BUILDNO    6
 
 #define __VER_STR2__(x) #x
 #define __VER_STR1__(x) __VER_STR2__(x)
diff --git a/test/scripts/breakpoint.py b/test/scripts/breakpoint.py
index c87f42c..b8b4b9f 100644
--- a/test/scripts/breakpoint.py
+++ b/test/scripts/breakpoint.py
@@ -132,7 +132,7 @@ class BreakpointTest( unittest.TestCase ):
 
             pykd.go()
 
-            bp = MyBreakpoint( targetModule.CdeclFunc )
+            bp = MyBreakpoint( targetModule.typedVar("CdeclFunc").getDebugStart() )
 
             self.assertEqual( pykd.executionStatus.Break, pykd.go() )
 
@@ -154,7 +154,7 @@ class BreakpointTest( unittest.TestCase ):
         targetModule.reload()
         with testutils.ContextCallIt( testutils.KillProcess(processId) ) as killStartedProcess :
             pykd.go()
-            bp = pykd.setBp( targetModule.CdeclFunc, makebpcallback(1) )
+            bp = pykd.setBp( targetModule.typedVar("CdeclFunc").getDebugStart(), makebpcallback(1) )
             self.assertEqual( pykd.executionStatus.Break, pykd.go() )
 
 
@@ -163,7 +163,7 @@ class BreakpointTest( unittest.TestCase ):
         targetModule.reload()
         with testutils.ContextCallIt( testutils.KillProcess(processId) ) as killStartedProcess :
             pykd.go()
-            bp = pykd.setBp( targetModule.CdeclFunc, makebpcallback(100) )
+            bp = pykd.setBp(targetModule.typedVar("CdeclFunc").getDebugStart(), makebpcallback(100) )
             self.assertEqual( pykd.executionStatus.NoDebuggee, pykd.go() )
 
     def testBreakpointEnum(self):
diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py
index b35c717..63d3360 100644
--- a/test/scripts/moduletest.py
+++ b/test/scripts/moduletest.py
@@ -104,7 +104,7 @@ class ModuleTest( unittest.TestCase ):
         # targetapp!ulongConst = 0x5555
         # targetapp!classChild::m_staticConst = <no type information>
         lst = target.module.enumSymbols( "*Const")
-        self.assertEqual( 4, len(lst) )
+        self.assertEqual( 3, len(lst) )
 
         lst = target.module.enumSymbols( "*cal?Func")
         self.assertEqual( 4, len(lst) )
diff --git a/test/scripts/pykdtest.pyproj b/test/scripts/pykdtest.pyproj
index 2a4a7d4..0e68eca 100644
--- a/test/scripts/pykdtest.pyproj
+++ b/test/scripts/pykdtest.pyproj
@@ -8,18 +8,18 @@
     <StartupFile>pykdtest.py</StartupFile>
     <SearchPath>
     </SearchPath>
-    <WorkingDirectory>..\..\out\Win32\Debug_2.7</WorkingDirectory>
+    <WorkingDirectory>..\..\out\x64\Debug_2.7</WorkingDirectory>
     <OutputPath>.</OutputPath>
     <Name>pykdtest</Name>
     <RootNamespace>pykdtest</RootNamespace>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <CommandLineArguments>C:\proj\pykd-rel\out\Win32\Debug\targetapp.exe</CommandLineArguments>
+    <CommandLineArguments>C:\proj\pykd_dev\out\x64\Debug\targetapp.exe</CommandLineArguments>
     <InterpreterPath />
     <InterpreterArguments>
     </InterpreterArguments>
-    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
+    <EnableNativeCodeDebugging>True</EnableNativeCodeDebugging>
     <IsWindowsApplication>False</IsWindowsApplication>
-    <InterpreterId>{2af0f10d-7135-4994-9156-5d01c9c11b7e}</InterpreterId>
+    <InterpreterId>{9a7a9026-48c1-4688-9d5d-e5699d47d074}</InterpreterId>
     <InterpreterVersion>2.7</InterpreterVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -59,6 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <InterpreterReference Include="{2af0f10d-7135-4994-9156-5d01c9c11b7e}\2.7" />
+    <InterpreterReference Include="{9a7a9026-48c1-4688-9d5d-e5699d47d074}\2.7" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/scripts/stacktest.py b/test/scripts/stacktest.py
index eba7d2b..e3a8abd 100644
--- a/test/scripts/stacktest.py
+++ b/test/scripts/stacktest.py
@@ -15,19 +15,14 @@ class StackTest(unittest.TestCase):
 
         expectedStack = [ 'targetapp!stackTestRun2',
                   'targetapp!stackTestRun1',
-                  'targetapp!stackTestRun',
-                  'targetapp!wmain',
-                  'targetapp!__tmainCRTStartup',
-                  'targetapp!wmainCRTStartup',
-                  'kernel32!BaseThreadInitThunk',
-                  'ntdll!RtlUserThreadStart' ]
+                  'targetapp!stackTestRun']
 
         realStack = []
         for frame in pykd.getStack():
             moduleName, symbolName, disp = pykd.findSymbolAndDisp( frame.ip )
             realStack.append( "%s!%s" % ( moduleName, symbolName ) )
 
-        self.assertEqual( expectedStack, realStack )
+        self.assertEqual( expectedStack, realStack[0:3])
 
     def testGetParams(self):
         expectedParams = ["a", "b", "c"]
diff --git a/test/scripts/targetprocess.py b/test/scripts/targetprocess.py
index a33e3fe..ff8c776 100644
--- a/test/scripts/targetprocess.py
+++ b/test/scripts/targetprocess.py
@@ -23,7 +23,7 @@ class ProcessTest(unittest.TestCase):
         threadNumber = proc.getNumberThreads()
         self.assertLess(0, threadNumber)
         for i in xrange(threadNumber):
-            thread = proc.thread(i)
+            thread = proc.getThread(i)
             self.assertNotEqual(0, thread.systemID )
             self.assertNotEqual(0, thread.teb )
 
@@ -39,7 +39,7 @@ class ProcessTest(unittest.TestCase):
         threadNumber = proc.getNumberThreads()
         self.assertLess(0, threadNumber)
         for i in xrange(threadNumber):
-            thread = proc.thread(i)
+            thread = proc.getThread(i)
             thread.setCurrent()
 
     def testGetBreakpoint(self):