diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 08add06..823ee38 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -218,6 +218,7 @@ class DebugSession( object ):
     if self._connection:
       self._connection.OnData( data )
 
+
   def OnServerStderr( self, data ):
     self._logger.info( "Server stderr: %s", data )
     if self._outputView:
diff --git a/python3/vimspector/output.py b/python3/vimspector/output.py
index 00faec2..be722af 100644
--- a/python3/vimspector/output.py
+++ b/python3/vimspector/output.py
@@ -103,7 +103,7 @@ class OutputView( object ):
         if 'E516' not in e:
           raise
 
-    self._buffers.clear()
+    self._buffers = {}
 
   def _ShowOutput( self, category ):
     utils.JumpToWindow( self._window )
diff --git a/tests/breakpoints.test.vim b/tests/breakpoints.test.vim
index d57ae5b..9faf08e 100644
--- a/tests/breakpoints.test.vim
+++ b/tests/breakpoints.test.vim
@@ -141,7 +141,7 @@ endfunction
 function Test_StopAtEntry()
   lcd testdata/cpp/simple
   edit simple.cpp
-  call setpos( '.', [ 0, 15, 1 ] )
+  call setpos( '.', [ 0, 1, 1 ] )
 
   " Test stopAtEntry behaviour
   call feedkeys( "\<F5>", 'xt' )
@@ -214,6 +214,9 @@ function Test_DisableBreakpointWhileDebugging()
   call WaitForAssert( {->
         \ assert_true ( pyxeval( '_vimspector_session._connection is None' ) )
         \ } )
+  call WaitForAssert( {->
+        \ assert_true( pyxeval( '_vimspector_session._uiTab is None' ) )
+        \ } )
 
   " Check breakpoint is now a user breakpoint
   call setpos( '.', [ bufnr( 'simple.cpp' ), 1, 1 ] )
diff --git a/tests/lib/autoload/vimspector/test/setup.vim b/tests/lib/autoload/vimspector/test/setup.vim
index a2e6ceb..012549f 100644
--- a/tests/lib/autoload/vimspector/test/setup.vim
+++ b/tests/lib/autoload/vimspector/test/setup.vim
@@ -24,6 +24,9 @@ function! vimspector#test#setup#Reset() abort
   call WaitForAssert( {->
         \ assert_true( pyxeval( '_vimspector_session._connection is None' ) )
         \ } )
+  call WaitForAssert( {->
+        \ assert_true( pyxeval( '_vimspector_session._uiTab is None' ) )
+        \ } )
 
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
   call vimspector#ClearBreakpoints()
diff --git a/tests/lib/run_test.vim b/tests/lib/run_test.vim
index ffe1e9c..dc66d8b 100644
--- a/tests/lib/run_test.vim
+++ b/tests/lib/run_test.vim
@@ -211,6 +211,7 @@ func AfterTheTest()
     let logfile = s:testid_filesafe . '.vimspector.log'
     call writefile( log, logfile, 's' )
     call add( s:messages, 'Wrote log for failed test: ' . logfile )
+    call extend( s:messages, log )
   endif
 endfunc