--- a/tests/GDBDebuggerTests.st	Sun Sep 07 14:42:02 2014 +0100
+++ b/tests/GDBDebuggerTests.st	Sun Sep 07 22:44:55 2014 +0100
@@ -65,13 +65,16 @@
 !GDBDebuggerTests methodsFor:'tests - threads'!
 
 test_inferiors_01a
-    | event |
+    | tgevent tevent |
 
     simulator := GDBSimulatorProcess new record: GDBSimulatorResource session_factorial_01.
     simulator start.
     debugger := GDBDebugger newWithProcess: simulator.
     debugger announcer when: GDBThreadGroupEvent do:[:ev |  
-        event := ev.
+        tgevent := ev.
+    ].
+    debugger announcer when: GDBThreadEvent do:[:ev |  
+        tevent := ev.
     ].
 
     debugger send: (GDBMI_file_exec_and_symbols new arguments: {'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv1/build/jv/libgdbs/tests/c/factorial'}).
@@ -84,19 +87,33 @@
     "/ self assert: debugger inferiors anElement == event threadGroup.
 
     debugger send: (GDBCLICommand new value: 'r').
+    Delay waitForMilliseconds: 100. "/ Give it chance to catch up with events.  
 
+    self assert: tgevent notNil.
+    self assert: tevent notNil.
     self assert: debugger inferiors size == 1.
     self assert: debugger inferiors anElement pid = 7719.
-    self assert: debugger inferiors anElement == event threadGroup.
+    self assert: debugger inferiors anElement == tgevent threadGroup.
+    self assert: debugger inferiors anElement threads size == 1.
+    self assert: debugger inferiors anElement threads anElement == tevent thread.
+    self assert: debugger inferiors anElement threads anElement terminated not.
+
+    tgevent := tevent := nil.
 
     debugger send: (GDBCLICommand new value: 'del 1').
     debugger send: (GDBCLICommand new value: 'c').
+    Delay waitForMilliseconds: 100. "/ Give it chance to catch up with events.  
 
+    self assert: tgevent notNil.
     self assert: debugger inferiors size == 1.
     self assert: debugger inferiors anElement exitCode = 23.
-    self assert: debugger inferiors anElement == event threadGroup.
+    self assert: debugger inferiors anElement == tgevent threadGroup.
+    self assert: debugger inferiors anElement threads size == 1.
+    self assert: debugger inferiors anElement threads anElement == tevent thread.
+    self assert: debugger inferiors anElement threads anElement terminated.
 
     "Created: / 07-09-2014 / 13:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-09-2014 / 22:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !GDBDebuggerTests class methodsFor:'documentation'!