--- a/reports/Builder__TestReportFormat.st	Mon Jun 15 11:32:39 2020 +0100
+++ b/reports/Builder__TestReportFormat.st	Mon Jun 29 22:24:29 2020 +0100
@@ -108,17 +108,14 @@
 
 writeContext: context on: s
 
-    |home mthd src rcvr vars args argAndVarNames srcFirstLineNr |
+    | home mthd src rcvr srcFirstLineNr |
     [
     context printOn: s.
     s cr.
     s nextPutAll:'receiver: '. context receiver printOn: s. s cr.
     s nextPutAll:'selector: '. context selector storeOn: s. s cr.
 
-    args := context args.
-    vars := context vars.
     rcvr := context receiver.
-    argAndVarNames := context argAndVarNames.
 
     s nextPutAll:'args: '; cr.
     self writeContextArgs: context on: s.
@@ -178,10 +175,14 @@
         last := (srcFirstLineNr + 29) min: src size.
         src := src copyFrom: srcFirstLineNr to: last.
     ].
-    src keysAndValuesDo:[:lNr :line |
+    src keysAndValuesDo:[:i :line |
+        | lineNo |
+
+        lineNo := i + srcFirstLineNr - 1.
+
         s nextPutAll:'  '. 
-        (lNr + srcFirstLineNr - 1) printOn: s leftPaddedTo:4.
-        lNr == context lineNumber ifTrue:[
+        lineNo printOn: s leftPaddedTo:4.
+        lineNo == context lineNumber ifTrue:[
             s nextPutAll:'>> '.
         ] ifFalse:[
             s nextPutAll:'   '.
@@ -215,7 +216,7 @@
 
     "Created: / 03-08-2011 / 14:53:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-03-2016 / 14:34:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-06-2020 / 11:26:31 / Jan Vrany <jan.vrany@labware.com>"
+    "Modified (format): / 29-06-2020 / 22:20:44 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 writeContextArgs: context on: s