diff --git a/autoload/vimspector/internal/job.vim b/autoload/vimspector/internal/job.vim
index 18c5b08..88c63cd 100644
--- a/autoload/vimspector/internal/job.vim
+++ b/autoload/vimspector/internal/job.vim
@@ -20,10 +20,26 @@ set cpoptions&vim
 " }}}
 
 function! s:_OnServerData( channel, data ) abort
+  if py3eval( '_vimspector_session is None' )
+    call ch_log( 'Unexpected stdout data received on channel '
+               \ . a:channel
+               \ . 'after reset: '
+               \ . a:data )
+    return
+  endif
+
   py3 _vimspector_session.OnChannelData( vim.eval( 'a:data' ) )
 endfunction
 
 function! s:_OnServerError( channel, data ) abort
+  if py3eval( '_vimspector_session is None' )
+    call ch_log( 'Unexpected stderr data received on channel '
+               \ . a:channel
+               \ . 'after reset: '
+               \ . a:data )
+    return
+  endif
+
   py3 _vimspector_session.OnServerStderr( vim.eval( 'a:data' ) )
 endfunction
 
@@ -43,7 +59,7 @@ endfunction
 
 function! vimspector#internal#job#StartDebugSession( config ) abort
   if exists( 's:job' )
-    echom 'Not starging: Job is already running'
+    echom 'Not starting: Job is already running'
     redraw
     return v:false
   endif
diff --git a/tests/breakpoints.test.vim b/tests/breakpoints.test.vim
index 07c008e..fe3b303 100644
--- a/tests/breakpoints.test.vim
+++ b/tests/breakpoints.test.vim
@@ -72,6 +72,7 @@ function! Test_Signs_Placed_Using_API_Are_Shown()
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorBP' )
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
 
+  call vimspector#test#setup#Reset()
   %bwipeout!
 endfunction
 
@@ -244,6 +245,7 @@ function Test_DisableBreakpointWhileDebugging()
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
 
   lcd -
+  call vimspector#test#setup#Reset()
   %bwipeout!
 endfunction
 
diff --git a/tests/ci/image/Dockerfile b/tests/ci/image/Dockerfile
index 77e7131..d400ed6 100644
--- a/tests/ci/image/Dockerfile
+++ b/tests/ci/image/Dockerfile
@@ -27,7 +27,7 @@ RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime && \
 ## cleanup of files from setup
 RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ARG VIM_VERSION=v8.2.0460
+ARG VIM_VERSION=v8.2.0716
 
 ENV CONF_ARGS "--with-features=huge \
                --enable-python3interp \
diff --git a/tests/lib/autoload/vimspector/test/setup.vim b/tests/lib/autoload/vimspector/test/setup.vim
index 6610647..d69acef 100644
--- a/tests/lib/autoload/vimspector/test/setup.vim
+++ b/tests/lib/autoload/vimspector/test/setup.vim
@@ -17,11 +17,14 @@ function! vimspector#test#setup#ClearDown() abort
 endfunction
 
 function! vimspector#test#setup#WaitForReset() abort
+  call WaitForAssert( {-> assert_equal( 1, len( gettabinfo() ) ) } )
   call WaitForAssert( {->
-        \ assert_true( pyxeval( '_vimspector_session._connection is None' ) )
+        \ assert_true( pyxeval( '_vimspector_session is None or ' .
+        \                       '_vimspector_session._connection is None' ) )
         \ } )
   call WaitForAssert( {->
-        \ assert_true( pyxeval( '_vimspector_session._uiTab is None' ) )
+        \ assert_true( pyxeval( '_vimspector_session is None or ' .
+        \                       '_vimspector_session._uiTab is None' ) )
         \ }, 10000 )
 
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
@@ -37,5 +40,7 @@ function! vimspector#test#setup#Reset() abort
   if exists( '*vimspector#internal#state#Reset' )
     call vimspector#internal#state#Reset()
   endif
+
+  call popup_clear()
 endfunction
 
diff --git a/tests/manual/image/Dockerfile b/tests/manual/image/Dockerfile
index badfa36..1b6b546 100644
--- a/tests/manual/image/Dockerfile
+++ b/tests/manual/image/Dockerfile
@@ -16,5 +16,6 @@ WORKDIR /home/dev
 
 ENV HOME /home/dev
 ENV PYTHON_CONFIGURE_OPTS --enable-shared
+ENV VIMSPECTOR_MIMODE gdb
 
 ADD --chown=dev:dev .vim/ /home/dev/.vim/