--- a/RegressionTests__ImageReaderTest.st	Fri Oct 13 17:02:36 2017 +0200
+++ b/RegressionTests__ImageReaderTest.st	Fri Oct 13 17:03:19 2017 +0200
@@ -29,31 +29,12 @@
 "
 ! !
 
-!ImageReaderTest methodsFor:'misc'!
-
-packageDirectory
-    |packageDirectory pathOfSTXExecutable|
-
-    packageDirectory := self class packageDirectory.
-    packageDirectory notNil ifTrue:[
-        ^ packageDirectory
-    ].
-
-    pathOfSTXExecutable := OperatingSystem pathOfSTXExecutable.
-    (pathOfSTXExecutable includesSubString:'quickSelfTest') ifTrue:[
-        "started from stx/goodies/builder/quickSelfTest"
-        ^ pathOfSTXExecutable asFilename directory directory directory / 'regression'
-    ].
-
-    self error:'no package path'.
-! !
-
 !ImageReaderTest methodsFor:'tests'!
 
 test001_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test1.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test1.bmp').
     self assert:(img notNil).
     self assert:(img depth == 1).
 
@@ -71,7 +52,7 @@
 test002_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test4.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test4.bmp').
     self assert:(img notNil).
     self assert:(img depth == 4).
 
@@ -91,7 +72,7 @@
 test003_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test8.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test8.bmp').
     self assert:(img notNil).
     self assert:(img depth == 8).
     self assert:((img colorAtX:30 y:0) rgbValue = 16rFF0000).
@@ -105,7 +86,7 @@
 test004_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/testcompress4.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/testcompress4.bmp').
     self assert:(img notNil).
     self assert:(img depth == 4).
     self assert:((img colorAtX:0 y:15) rgbValue = 16rFF0000).
@@ -124,7 +105,7 @@
 test005_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/testcompress8.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/testcompress8.bmp').
     self assert:(img notNil).
     self assert:(img depth == 8).
     self assert:((img colorAtX:30 y:0) rgbValue = 16rFF0000).
@@ -138,7 +119,7 @@
 test006_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test8os2.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test8os2.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
@@ -150,7 +131,7 @@
 test007_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test4os2v2.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test4os2v2.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
@@ -162,7 +143,7 @@
 test008_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test16.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test16.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
@@ -174,7 +155,7 @@
 test009_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test24.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test24.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
@@ -186,7 +167,7 @@
 test010_bmp
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/bmpImages/test32.bmp').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/test32.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
@@ -241,7 +222,7 @@
 testPNG_001_basn0g01
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/basn0g01.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/basn0g01.png').
     self assert:(img notNil).
     self assert:(img depth == 1).
     self assert:(img extent = (32@32)).
@@ -260,7 +241,7 @@
 testPNG_002_basn0g02
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/basn0g02.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/basn0g02.png').
     self assert:(img notNil).
     self assert:(img depth == 2).
     self assert:(img extent = (32@32)).
@@ -279,7 +260,7 @@
 testPNG_003_basi0g01
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/basi0g01.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/basi0g01.png').
     self assert:(img notNil).
     self assert:(img depth == 1).
     self assert:(img extent = (32@32)).
@@ -300,7 +281,7 @@
     
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/tbbn0g04.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/tbbn0g04.png').
     self assert:(img notNil).
     self assert:(img depth == 4).
     self assert:(img extent = (32@32)).
@@ -319,7 +300,7 @@
 testPNG_004_tbbn3p03
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/tbbn0g04.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/tbbn0g04.png').
     self assert:(img notNil).
     self assert:(img depth == 4).
     self assert:(img extent = (32@32)).
@@ -340,7 +321,7 @@
 
     |img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/tbbn3p08.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/tbbn3p08.png').
     self assert:(img notNil).
     self assert:(img depth == 8).
     self assert:(img extent = (32@32)).
@@ -361,7 +342,7 @@
 
     failed := OrderedCollection new.
     allOK := true.
-    (self packageDirectory construct:'testData/bmpImages') directoryContentsAsFilenamesDo:[:f |
+    (Helper packageDirectoryForRegressionTests construct:'testData/bmpImages') directoryContentsAsFilenamesDo:[:f |
         (f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
             Error handle:[:ex |
                 img := nil.
@@ -388,7 +369,7 @@
 
     failed := OrderedCollection new.
     allOK := true.
-    (self packageDirectory construct:'testData/bmpImages/bmpsuite-2.4') directoryContentsAsFilenamesDo:[:f |
+    (Helper packageDirectoryForRegressionTests construct:'testData/bmpImages/bmpsuite-2.4') directoryContentsAsFilenamesDo:[:f |
         (f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
             Error handle:[:ex |
                 img := nil.
@@ -418,7 +399,7 @@
 
     failed := OrderedCollection new.
     allOK := true.
-    (self packageDirectory construct:'testData/pngImages') directoryContentsAsFilenamesDo:[:f |
+    (Helper packageDirectoryForRegressionTests construct:'testData/pngImages') directoryContentsAsFilenamesDo:[:f |
         (f isRegularFile and:[f hasSuffix:'png']) ifTrue:[
             img := nil.
             (f baseName startsWith:'x') ifTrue:[
@@ -457,7 +438,7 @@
 test_png_02
     |referenceImg img|
 
-    img := Image fromFile:(self packageDirectory construct:'testData/pngImages/basn0g01.png').
+    img := Image fromFile:(Helper packageDirectoryForRegressionTests construct:'testData/pngImages/basn0g01.png').
     self assert:(img notNil).
 
     referenceImg := (Depth1Image new) width: 32; height: 32;