diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
index 74277eeb29..1f2e0780ae 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
@@ -148,7 +148,7 @@ namespace Debugger.Tests
 				LogEvent("ModuleLoaded", e.Module.Filename + (e.Module.HasSymbols ? " (Has symbols)" : " (No symbols)"));
 			};
 			process.Paused += delegate(object sender, ProcessEventArgs e) {
-				LogEvent("DebuggingPaused", e.Process.PauseSession.PausedReason.ToString());
+				LogEvent("DebuggingPaused", e.Process.PauseSession.PausedReason.ToString() + " " + e.Process.SelectedStackFrame.NextStatement.ToString());
 			};
 //			process.DebuggingResumed += delegate(object sender, ProcessEventArgs e) {
 //				LogEvent("DebuggingResumed", e.Process.PausedReason.ToString());
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
index 5317704673..2f2b061b32 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
@@ -54,7 +54,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ArrayValue.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break ArrayValue.cs:20,4-20,40</DebuggingPaused>
     <array>
       <Value
         ArrayDimensions="{5}"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Break.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Break.cs
index f44ee1901b..c9e37ab0f0 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Break.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Break.cs
@@ -41,7 +41,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Break.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Break.cs:16,4-16,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Breakpoint.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Breakpoint.cs
index c8e22a2b80..47cab0bc45 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Breakpoint.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Breakpoint.cs
@@ -57,7 +57,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Breakpoint.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Breakpoint.cs:16,4-16,40</DebuggingPaused>
     <Breakpoint
       CheckSum="null"
       Column="0"
@@ -69,9 +69,9 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Main 1\r\n</LogMessage>
-    <DebuggingPaused>Breakpoint</DebuggingPaused>
+    <DebuggingPaused>Breakpoint Breakpoint.cs:18,4-18,49</DebuggingPaused>
     <LogMessage>Main 2\r\n</LogMessage>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Breakpoint.cs:19,4-19,40</DebuggingPaused>
     <ProcessExited />
     <Breakpoint
       CheckSum="null"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
index 9e9548ada5..dcb8c4396e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
@@ -57,7 +57,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Callstack.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Callstack.cs:26,4-26,40</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
@@ -90,7 +90,7 @@ namespace Debugger.Tests {
           NextStatement="Callstack.cs:16,4-16,11" />
       </Item>
     </Callstack>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Callstack.cs:21,4-21,11</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
@@ -113,7 +113,7 @@ namespace Debugger.Tests {
           NextStatement="Callstack.cs:16,4-16,11" />
       </Item>
     </Callstack>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Callstack.cs:16,4-16,11</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs
index ac4e7bb0db..c51c3adc2f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs
@@ -85,7 +85,6 @@ namespace Debugger.Tests {
 		{
 			ExpandProperties(
 				"Value.Type",
-				"DebugType.BaseType",
 				"DebugType.ElementType"
 			);
 			StartTest("DebugTypes.cs");
@@ -106,7 +105,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>DebugTypes.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break DebugTypes.cs:57,4-57,40</DebuggingPaused>
     <LocalVariables
       Capacity="32"
       Count="19">
@@ -130,19 +129,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -168,7 +154,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -194,19 +179,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Primitive"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -232,7 +204,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -258,19 +229,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Primitive"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -296,19 +254,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Primitive"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -334,7 +279,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -344,19 +288,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -384,7 +315,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -394,19 +324,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -434,7 +351,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="null"
@@ -444,7 +360,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Pointer"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>null</BaseType>
                   <ElementType>
                     <DebugType
                       BaseType="System.Object"
@@ -454,19 +369,6 @@ namespace Debugger.Tests {
                       Interfaces="{}"
                       Kind="Primitive"
                       Module="{Exception: The type is not a class or value type.}">
-                      <BaseType>
-                        <DebugType
-                          BaseType="null"
-                          ElementType="null"
-                          FullName="System.Object"
-                          GenericArguments="{}"
-                          Interfaces="{}"
-                          Kind="Class"
-                          Module="mscorlib.dll">
-                          <BaseType>null</BaseType>
-                          <ElementType>null</ElementType>
-                        </DebugType>
-                      </BaseType>
                       <ElementType>null</ElementType>
                     </DebugType>
                   </ElementType>
@@ -496,7 +398,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="null"
@@ -506,7 +407,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Void"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>null</BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -534,7 +434,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -560,7 +459,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -586,31 +484,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Array"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.Array"
-                  GenericArguments="{}"
-                  Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -620,19 +493,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -660,31 +520,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Array"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.Array"
-                  GenericArguments="{}"
-                  Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -694,19 +529,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -734,31 +556,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="ValueType"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -784,7 +581,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.ValueType"
@@ -794,31 +590,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="ValueType"
                   Module="DebugTypes.exe">
-                  <BaseType>
-                    <DebugType
-                      BaseType="System.Object"
-                      ElementType="null"
-                      FullName="System.ValueType"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>
-                        <DebugType
-                          BaseType="null"
-                          ElementType="null"
-                          FullName="System.Object"
-                          GenericArguments="{}"
-                          Interfaces="{}"
-                          Kind="Class"
-                          Module="mscorlib.dll">
-                          <BaseType>null</BaseType>
-                          <ElementType>null</ElementType>
-                        </DebugType>
-                      </BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -846,31 +617,6 @@ namespace Debugger.Tests {
               Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}"
               Kind="ValueType"
               Module="mscorlib.dll">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -896,19 +642,6 @@ namespace Debugger.Tests {
               Interfaces="{MyInterface}"
               Kind="Class"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -934,26 +667,13 @@ namespace Debugger.Tests {
               Interfaces="{MyInterface}"
               Kind="Class"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
         </Value>
       </Item>
     </LocalVariables>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break DebugTypes.cs:74,4-74,40</DebuggingPaused>
     <Arguments
       Capacity="16"
       Count="15">
@@ -977,19 +697,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Primitive"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1015,19 +722,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Primitive"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="null"
-                  ElementType="null"
-                  FullName="System.Object"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>null</BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1053,7 +747,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -1063,19 +756,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1103,7 +783,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -1113,19 +792,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1153,7 +819,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="null"
@@ -1163,7 +828,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Pointer"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>null</BaseType>
                   <ElementType>
                     <DebugType
                       BaseType="System.Object"
@@ -1173,19 +837,6 @@ namespace Debugger.Tests {
                       Interfaces="{}"
                       Kind="Primitive"
                       Module="{Exception: The type is not a class or value type.}">
-                      <BaseType>
-                        <DebugType
-                          BaseType="null"
-                          ElementType="null"
-                          FullName="System.Object"
-                          GenericArguments="{}"
-                          Interfaces="{}"
-                          Kind="Class"
-                          Module="mscorlib.dll">
-                          <BaseType>null</BaseType>
-                          <ElementType>null</ElementType>
-                        </DebugType>
-                      </BaseType>
                       <ElementType>null</ElementType>
                     </DebugType>
                   </ElementType>
@@ -1215,7 +866,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="null"
@@ -1225,7 +875,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Void"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>null</BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1253,7 +902,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1279,7 +927,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Class"
               Module="mscorlib.dll">
-              <BaseType>null</BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1305,31 +952,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Array"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.Array"
-                  GenericArguments="{}"
-                  Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -1339,19 +961,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1379,31 +988,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Array"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.Array"
-                  GenericArguments="{}"
-                  Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.Object"
@@ -1413,19 +997,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="Primitive"
                   Module="{Exception: The type is not a class or value type.}">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1453,31 +1024,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="ValueType"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1503,31 +1049,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="ValueType"
               Module="DebugTypes.exe">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1553,7 +1074,6 @@ namespace Debugger.Tests {
               Interfaces="{}"
               Kind="Pointer"
               Module="{Exception: The type is not a class or value type.}">
-              <BaseType>null</BaseType>
               <ElementType>
                 <DebugType
                   BaseType="System.ValueType"
@@ -1563,31 +1083,6 @@ namespace Debugger.Tests {
                   Interfaces="{}"
                   Kind="ValueType"
                   Module="DebugTypes.exe">
-                  <BaseType>
-                    <DebugType
-                      BaseType="System.Object"
-                      ElementType="null"
-                      FullName="System.ValueType"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>
-                        <DebugType
-                          BaseType="null"
-                          ElementType="null"
-                          FullName="System.Object"
-                          GenericArguments="{}"
-                          Interfaces="{}"
-                          Kind="Class"
-                          Module="mscorlib.dll">
-                          <BaseType>null</BaseType>
-                          <ElementType>null</ElementType>
-                        </DebugType>
-                      </BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
                   <ElementType>null</ElementType>
                 </DebugType>
               </ElementType>
@@ -1615,31 +1110,6 @@ namespace Debugger.Tests {
               Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}"
               Kind="ValueType"
               Module="mscorlib.dll">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
@@ -1665,31 +1135,6 @@ namespace Debugger.Tests {
               Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}"
               Kind="ValueType"
               Module="mscorlib.dll">
-              <BaseType>
-                <DebugType
-                  BaseType="System.Object"
-                  ElementType="null"
-                  FullName="System.ValueType"
-                  GenericArguments="{}"
-                  Interfaces="{}"
-                  Kind="Class"
-                  Module="mscorlib.dll">
-                  <BaseType>
-                    <DebugType
-                      BaseType="null"
-                      ElementType="null"
-                      FullName="System.Object"
-                      GenericArguments="{}"
-                      Interfaces="{}"
-                      Kind="Class"
-                      Module="mscorlib.dll">
-                      <BaseType>null</BaseType>
-                      <ElementType>null</ElementType>
-                    </DebugType>
-                  </BaseType>
-                  <ElementType>null</ElementType>
-                </DebugType>
-              </BaseType>
               <ElementType>null</ElementType>
             </DebugType>
           </Type>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs
index d8e7a9a842..77428fb5f3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs
@@ -54,7 +54,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>DefinedTypes.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break DefinedTypes.cs:16,4-16,40</DebuggingPaused>
     <TypesAsString
       Capacity="4"
       Count="3">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception.cs
index 79a7d03776..02b5ccebb8 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception.cs
@@ -55,7 +55,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Exception.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Exception.cs:16,4-16,40</DebuggingPaused>
     <ExceptionThrown>System.Exception: test</ExceptionThrown>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs
index 07b4791471..34df161da6 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ExceptionCustom.cs
@@ -54,7 +54,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ExceptionCustom.exe (Has symbols)</ModuleLoaded>
     <ExceptionThrown>Debugger.Tests.TestPrograms.MyException: test2 ---&gt; Debugger.Tests.TestPrograms.MyException: test1</ExceptionThrown>
-    <DebuggingPaused>ExceptionIntercepted</DebuggingPaused>
+    <DebuggingPaused>ExceptionIntercepted ExceptionCustom.cs:27,5-27,39</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Expressions.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Expressions.cs
index 1a9898f54f..c5784b3f5a 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Expressions.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Expressions.cs
@@ -76,7 +76,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Expressions.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Expressions.cs:47,4-47,40</DebuggingPaused>
     <Arguments
       Capacity="4"
       Count="1">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
index dba214bc15..505aa3a3a9 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
@@ -92,8 +92,8 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>FunctionArgumentVariables.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:51,4-51,40</DebuggingPaused>
     <Arguments
       Capacity="16"
       Count="9">
@@ -206,7 +206,7 @@ namespace Debugger.Tests {
           Type="System.Nullable&lt;System.Int32&gt;" />
       </Item>
     </Arguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:57,4-57,40</DebuggingPaused>
     <Arguments
       Capacity="4"
       Count="1">
@@ -223,7 +223,7 @@ namespace Debugger.Tests {
           Type="System.String[]" />
       </Item>
     </Arguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:57,4-57,40</DebuggingPaused>
     <Arguments
       Capacity="4"
       Count="1">
@@ -240,7 +240,7 @@ namespace Debugger.Tests {
           Type="System.String[]" />
       </Item>
     </Arguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:57,4-57,40</DebuggingPaused>
     <Arguments
       Capacity="4"
       Count="1">
@@ -257,7 +257,7 @@ namespace Debugger.Tests {
           Type="System.String[]" />
       </Item>
     </Arguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionArgumentVariables.cs:62,4-62,40</DebuggingPaused>
     <Arguments
       Capacity="4"
       Count="2">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
index cebc8425e8..8b3f4f1c68 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
@@ -70,7 +70,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>FunctionLifetime.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionLifetime.cs:22,4-22,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="1"
@@ -81,7 +81,7 @@ namespace Debugger.Tests {
         MethodInfo="Function"
         NextStatement="FunctionLifetime.cs:22,4-22,40" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionLifetime.cs:29,4-29,40</DebuggingPaused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="{Exception: StackFrame is not valid anymore}"
@@ -102,7 +102,7 @@ namespace Debugger.Tests {
         MethodInfo="SubFunction"
         NextStatement="FunctionLifetime.cs:29,4-29,40" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionLifetime.cs:24,4-24,40</DebuggingPaused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="{Exception: StackFrame is not valid anymore}"
@@ -123,7 +123,7 @@ namespace Debugger.Tests {
         MethodInfo="Function"
         NextStatement="FunctionLifetime.cs:24,4-24,40" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionLifetime.cs:17,4-17,40</DebuggingPaused>
     <Main>
       <StackFrame
         ArgumentCount="0"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
index 47a766fc56..23100ddcaf 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
@@ -48,7 +48,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>FunctionLocalVariables.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionLocalVariables.cs:21,4-21,40</DebuggingPaused>
     <LocalVariables
       Capacity="8"
       Count="5">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionVariablesLifetime.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionVariablesLifetime.cs
index ab00f18f01..bc61f8690b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionVariablesLifetime.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionVariablesLifetime.cs
@@ -98,7 +98,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>FunctionVariablesLifetime.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionVariablesLifetime.cs:25,4-25,40</DebuggingPaused>
     <argument>
       <Value
         ArrayDimensions="{Exception: Value is not an array}"
@@ -135,7 +135,7 @@ namespace Debugger.Tests {
         PrimitiveValue="3"
         Type="System.Int32" />
     </_x0040_class>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionVariablesLifetime.cs:34,4-34,40</DebuggingPaused>
     <argument>
       <Value
         ArrayDimensions="{Exception: Value is no longer valid}"
@@ -184,7 +184,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionVariablesLifetime.cs:27,4-27,40</DebuggingPaused>
     <argument>
       <Value
         ArrayDimensions="{Exception: Value is no longer valid}"
@@ -233,7 +233,7 @@ namespace Debugger.Tests {
         PrimitiveValue="{Exception: Value is no longer valid}"
         Type="System.Int32" />
     </localInSubFunction>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionVariablesLifetime.cs:34,4-34,40</DebuggingPaused>
     <argument>
       <Value
         ArrayDimensions="{Exception: Value is no longer valid}"
@@ -294,7 +294,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction_x0028_new_x0029_>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break FunctionVariablesLifetime.cs:19,4-19,40</DebuggingPaused>
     <argument>
       <Value
         ArrayDimensions="{Exception: Value is no longer valid}"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
index 73e6e82c34..30ab16befb 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
@@ -131,7 +131,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Generics.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:48,4-48,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -196,7 +196,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:54,4-54,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -261,7 +261,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:60,4-60,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -326,7 +326,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:66,4-66,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -391,7 +391,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:75,4-75,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -456,7 +456,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:81,4-81,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -521,7 +521,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:87,4-87,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -586,7 +586,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:93,4-93,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="2"
@@ -651,7 +651,7 @@ namespace Debugger.Tests {
           Type="System.String" />
       </Item>
     </SelectedStackFrame-GetArguments>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Generics.cs:28,4-28,40</DebuggingPaused>
     <Prop>
       <Value
         ArrayDimensions="{Exception: Value is not an array}"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
index bf9bfc0621..363a9e19b5 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
@@ -58,7 +58,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>MainThreadExit.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break MainThreadExit.cs:23,4-23,40</DebuggingPaused>
     <ThreadsBeforeExit
       Count="2">
       <Item>
@@ -98,7 +98,7 @@ namespace Debugger.Tests {
           Suspended="False" />
       </Item>
     </ThreadsBeforeExit>
-    <DebuggingPaused>ForcedBreak</DebuggingPaused>
+    <DebuggingPaused>ForcedBreak MainThreadExit.cs:28,4-28,26</DebuggingPaused>
     <ThreadsAfterExit
       Count="2">
       <Item>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
index eb32443e0d..060b18e794 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
@@ -76,7 +76,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Metadata.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Metadata.cs:39,4-39,40</DebuggingPaused>
     <Members
       Capacity="32"
       Count="22">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
index 8b509e6c15..3db749ddb6 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MetadataIdentity.cs
@@ -57,8 +57,8 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>MetadataIdentity.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break MetadataIdentity.cs:21,4-21,40</DebuggingPaused>
+    <DebuggingPaused>Break MetadataIdentity.cs:22,4-22,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs
index 1a8205902f..51e0f29ec5 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs
@@ -55,7 +55,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>PrimitiveValue.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break PrimitiveValue.cs:20,4-20,40</DebuggingPaused>
     <locals
       Capacity="4"
       Count="4">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/SetIP.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/SetIP.cs
index 72a6bf91e9..32f9c2e233 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/SetIP.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/SetIP.cs
@@ -54,10 +54,10 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>1\r\n</LogMessage>
-    <DebuggingPaused>Break</DebuggingPaused>
-    <DebuggingPaused>SetIP</DebuggingPaused>
+    <DebuggingPaused>Break SetIP.cs:17,4-17,40</DebuggingPaused>
+    <DebuggingPaused>SetIP SetIP.cs:16,4-16,44</DebuggingPaused>
     <LogMessage>1\r\n</LogMessage>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break SetIP.cs:17,4-17,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
index e84d2576bf..e67af62e1e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
@@ -50,9 +50,9 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackOverflow.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break StackOverflow.cs:16,4-16,40</DebuggingPaused>
     <ExceptionThrown>Could not intercept: System.StackOverflowException</ExceptionThrown>
-    <DebuggingPaused>Exception</DebuggingPaused>
+    <DebuggingPaused>Exception StackOverflow.cs:21,3-21,4</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
index 6d08cd297c..ee25f29094 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
@@ -206,75 +206,75 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Stepping.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break Stepping.cs:102,4-102,40</DebuggingPaused>
     <Log>Starting run with JMC=True</Log>
-    <DebuggingPaused>SetIP</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>SetIP Stepping.cs:103,4-103,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:104,4-104,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:27,27-27,28</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:104,4-104,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:30,25-30,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:106,4-106,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:107,4-107,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:108,4-108,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:109,4-109,14</DebuggingPaused>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:62,3-62,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:63,4-63,46</DebuggingPaused>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:64,4-64,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:62,3-62,4</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:109,4-109,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:91,50-91,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:94,50-94,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:111,3-111,4</DebuggingPaused>
     <Log>Starting run with JMC=True</Log>
-    <DebuggingPaused>SetIP</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>SetIP Stepping.cs:103,4-103,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:104,4-104,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:27,27-27,28</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:104,4-104,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:30,25-30,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:106,4-106,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:107,4-107,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:108,4-108,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:109,4-109,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:62,3-62,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:63,4-63,46</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:64,4-64,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:62,3-62,4</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:109,4-109,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:91,50-91,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:94,50-94,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:111,3-111,4</DebuggingPaused>
     <Log>Starting run with JMC=False</Log>
-    <DebuggingPaused>SetIP</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>SetIP Stepping.cs:103,4-103,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:104,4-104,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:30,25-30,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:105,4-105,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:106,4-106,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:107,4-107,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:108,4-108,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:109,4-109,14</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:91,50-91,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:94,50-94,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:110,4-110,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete Stepping.cs:111,3-111,4</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminatePausedProcess.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminatePausedProcess.cs
index 26dda5eafb..70e4866e1d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminatePausedProcess.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminatePausedProcess.cs
@@ -45,12 +45,12 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break TerminatePausedProcess.cs:16,4-16,40</DebuggingPaused>
     <ProcessExited />
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break TerminatePausedProcess.cs:16,4-16,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminateRunningProcess.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminateRunningProcess.cs
index e7c8932caf..9748b54ffa 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminateRunningProcess.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/TerminateRunningProcess.cs
@@ -57,15 +57,15 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>Break TerminateRunningProcess.cs:20,4-20,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete TerminateRunningProcess.cs:21,4-21,26</DebuggingPaused>
     <Log>Calling terminate</Log>
     <ProcessExited />
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
-    <DebuggingPaused>StepComplete</DebuggingPaused>
+    <DebuggingPaused>Break TerminateRunningProcess.cs:20,4-20,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete TerminateRunningProcess.cs:21,4-21,26</DebuggingPaused>
     <Log>Calling terminate</Log>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
index ad29b78362..0f5e2cc881 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
@@ -73,7 +73,7 @@ namespace Debugger.Tests {
         Suspended="False" />
     </ThreadStartedEvent>
     <ModuleLoaded>ThreadName.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break ThreadName.cs:17,4-17,40</DebuggingPaused>
     <Thread>
       <Thread
         CurrentException="null"
@@ -92,7 +92,7 @@ namespace Debugger.Tests {
         SelectedStackFrame="Debugger.Tests.TestPrograms.ThreadName.Main"
         Suspended="False" />
     </Thread>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break ThreadName.cs:19,4-19,40</DebuggingPaused>
     <Thread>
       <Thread
         CurrentException="null"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
index 0b0acdda58..69952a0924 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
@@ -52,7 +52,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ValueType.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break ValueType.cs:21,4-21,40</DebuggingPaused>
     <this>
       <Value
         ArrayDimensions="{Exception: Value is not an array}"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/_Template.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/_Template.cs
index a351a4a05a..b58e20030c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/_Template.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/_Template.cs
@@ -41,7 +41,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>_Template.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break</DebuggingPaused>
+    <DebuggingPaused>Break _Template.cs:16,4-16,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>