diff --git a/ci/build_unix.sh b/ci/build_unix.sh
index 2cdfb0f36..5ebf972ff 100644
--- a/ci/build_unix.sh
+++ b/ci/build_unix.sh
@@ -17,6 +17,12 @@ if [[ `uname` == 'Darwin' ]]; then
     export SHLIB_EXT=".dylib"
     # I - hmaarrrfk - forget why the definition of LDFLAGS here is necessary
     export LDFLAGS="-undefined dynamic_lookup ${LDFLAGS}"
+
+    # clang14 introduced a new default that turns this flag on on osx arm64 leading
+    # to failing tests. Setting it off restores clang13 behavior and seems in line
+    # with x86 compilation.
+    # ref: https://github.com/llvm/llvm-project/issues/91824
+    export CXXFLAGS="-ffp-contract=off ${CXXFLAGS}"
 else
     export SHLIB_EXT=".so"
 fi
diff --git a/docsrc/Doxyfile.in b/docsrc/Doxyfile.in
index d734e9356..2d706b450 100644
--- a/docsrc/Doxyfile.in
+++ b/docsrc/Doxyfile.in
@@ -783,7 +783,7 @@ HTML_STYLESHEET        = @PROJECT_SOURCE_DIR@/docsrc/vigra.css
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
-HTML_EXTRA_FILES       = @PROJECT_SOURCE_DIR@/src/examples/lenna_color.gif \
+HTML_EXTRA_FILES       = @PROJECT_SOURCE_DIR@/src/examples/astronaut_color.gif \
                          @PROJECT_SOURCE_DIR@/src/examples/lenna_gray.gif
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
diff --git a/docsrc/examples.dxx b/docsrc/examples.dxx
index 7d50cbe3a..b32a7b53e 100644
--- a/docsrc/examples.dxx
+++ b/docsrc/examples.dxx
@@ -7,7 +7,7 @@
     See <a href="Installation.html">Installation</a> for instructions on how these
     programs can be compiled. For convenience, the directory contains the test images 
     <a href="lenna_gray.gif">lenna_gray.gif</a> and 
-    <a href="lenna_color.gif">lenna_color.gif</a>.
+    <a href="astronaut_color.gif">astronaut_color.gif</a>.
     
     <ul>
     
diff --git a/docsrc/image_processing.dxx b/docsrc/image_processing.dxx
index 087932920..15f45cda5 100644
--- a/docsrc/image_processing.dxx
+++ b/docsrc/image_processing.dxx
@@ -107,7 +107,7 @@
     And here are the results:
     <table cellspacing = "10">
     <TR valign = "bottom">
-    <TD> \image html lenna_color_small.gif "input file 1" </TD>
+    <TD> \image html astronaut_color_small.gif "input file 1" </TD>
     <TD> \image html oi_small.jpg "input file 2" </TD>
     <TD> \image html dissolved_color.gif "dissolved output file" </TD>
     </TR>
@@ -132,7 +132,7 @@
     And here are the results:
     <Table cellspacing = "10">
     <TR valign = "bottom">
-    <TD> \image html lenna_color_small.gif "input file" </TD>
+    <TD> \image html astronaut_color_small.gif "input file" </TD>
     <TD> \image html lenna_composite_color.gif "composite output file" </TD>
     </TR>
     </Table>
diff --git a/src/examples/astronaut_color.gif b/src/examples/astronaut_color.gif
new file mode 100644
index 000000000..c3ba355d5
Binary files /dev/null and b/src/examples/astronaut_color.gif differ
diff --git a/src/examples/astronaut_color_small.gif b/src/examples/astronaut_color_small.gif
new file mode 100644
index 000000000..5674188ab
Binary files /dev/null and b/src/examples/astronaut_color_small.gif differ
diff --git a/src/examples/lenna_color.gif b/src/examples/lenna_color.gif
deleted file mode 100644
index 36515b6cb..000000000
Binary files a/src/examples/lenna_color.gif and /dev/null differ
diff --git a/src/examples/lenna_color_small.gif b/src/examples/lenna_color_small.gif
deleted file mode 100644
index dc4324165..000000000
Binary files a/src/examples/lenna_color_small.gif and /dev/null differ
diff --git a/src/examples/tutorial/astronaut_color.gif b/src/examples/tutorial/astronaut_color.gif
new file mode 100644
index 000000000..c3ba355d5
Binary files /dev/null and b/src/examples/tutorial/astronaut_color.gif differ
diff --git a/src/examples/tutorial/astronaut_color_small.gif b/src/examples/tutorial/astronaut_color_small.gif
new file mode 100644
index 000000000..5674188ab
Binary files /dev/null and b/src/examples/tutorial/astronaut_color_small.gif differ
diff --git a/src/examples/tutorial/lenna_color.gif b/src/examples/tutorial/lenna_color.gif
deleted file mode 100644
index 36515b6cb..000000000
Binary files a/src/examples/tutorial/lenna_color.gif and /dev/null differ
diff --git a/src/examples/tutorial/lenna_color_small.gif b/src/examples/tutorial/lenna_color_small.gif
deleted file mode 100644
index dc4324165..000000000
Binary files a/src/examples/tutorial/lenna_color_small.gif and /dev/null differ
diff --git a/src/images/astronaut_color.gif b/src/images/astronaut_color.gif
new file mode 100644
index 000000000..c3ba355d5
Binary files /dev/null and b/src/images/astronaut_color.gif differ
diff --git a/src/images/astronaut_color_small.gif b/src/images/astronaut_color_small.gif
new file mode 100644
index 000000000..5674188ab
Binary files /dev/null and b/src/images/astronaut_color_small.gif differ
diff --git a/src/images/lenna_color.gif b/src/images/lenna_color.gif
deleted file mode 100644
index 36515b6cb..000000000
Binary files a/src/images/lenna_color.gif and /dev/null differ
diff --git a/src/images/lenna_color_small.gif b/src/images/lenna_color_small.gif
deleted file mode 100644
index dc4324165..000000000
Binary files a/src/images/lenna_color_small.gif and /dev/null differ
diff --git a/test/convolution/CMakeLists.txt b/test/convolution/CMakeLists.txt
index 8adb8a4b2..d2534401d 100644
--- a/test/convolution/CMakeLists.txt
+++ b/test/convolution/CMakeLists.txt
@@ -1,3 +1,3 @@
 VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
 
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
+VIGRA_COPY_TEST_DATA(astronaut128.xv astronaut_simple_sharpening_orig.xv astronaut_gaussian_sharpening_orig.xv astronaut128sepgrad.xv astronauthessxx.xv astronautstxx.xv astronaut128recgrad.xv astronaut128nonlinear.xv resampling.xv astronauthessyy.xv astronautstyy.xv astronauthessxy.xv astronautstxy.xv astronaut128rgb.xv astronaut128rgbsepgrad.xv astronaut_level-2.xv astronaut_level-1.xv astronaut_level1.xv astronaut_level2.xv astronaut_levellap0.xv astronaut_levellap1.xv astronaut_levellap2.xv astronautrgbst.xv)
diff --git a/test/convolution/astronaut128.xv b/test/convolution/astronaut128.xv
new file mode 100644
index 000000000..7348368b3
Binary files /dev/null and b/test/convolution/astronaut128.xv differ
diff --git a/test/convolution/astronaut128nonlinear.xv b/test/convolution/astronaut128nonlinear.xv
new file mode 100644
index 000000000..0c5dcb858
Binary files /dev/null and b/test/convolution/astronaut128nonlinear.xv differ
diff --git a/test/convolution/astronaut128recgrad.xv b/test/convolution/astronaut128recgrad.xv
new file mode 100644
index 000000000..c0d118ae3
Binary files /dev/null and b/test/convolution/astronaut128recgrad.xv differ
diff --git a/test/convolution/astronaut128rgb.xv b/test/convolution/astronaut128rgb.xv
new file mode 100644
index 000000000..cc6b9b2dc
Binary files /dev/null and b/test/convolution/astronaut128rgb.xv differ
diff --git a/test/convolution/astronaut128rgbsepgrad.xv b/test/convolution/astronaut128rgbsepgrad.xv
new file mode 100644
index 000000000..23047d415
Binary files /dev/null and b/test/convolution/astronaut128rgbsepgrad.xv differ
diff --git a/test/convolution/astronaut128sepgrad.xv b/test/convolution/astronaut128sepgrad.xv
new file mode 100644
index 000000000..681a1e674
Binary files /dev/null and b/test/convolution/astronaut128sepgrad.xv differ
diff --git a/test/convolution/astronaut_gaussian_sharpening_orig.xv b/test/convolution/astronaut_gaussian_sharpening_orig.xv
new file mode 100644
index 000000000..6e73f2cfd
Binary files /dev/null and b/test/convolution/astronaut_gaussian_sharpening_orig.xv differ
diff --git a/test/convolution/astronaut_level-1.xv b/test/convolution/astronaut_level-1.xv
new file mode 100755
index 000000000..cc331d086
Binary files /dev/null and b/test/convolution/astronaut_level-1.xv differ
diff --git a/test/convolution/astronaut_level-2.xv b/test/convolution/astronaut_level-2.xv
new file mode 100755
index 000000000..fc2f3bcc2
Binary files /dev/null and b/test/convolution/astronaut_level-2.xv differ
diff --git a/test/convolution/astronaut_level1.xv b/test/convolution/astronaut_level1.xv
new file mode 100755
index 000000000..1a48939c7
Binary files /dev/null and b/test/convolution/astronaut_level1.xv differ
diff --git a/test/convolution/astronaut_level2.xv b/test/convolution/astronaut_level2.xv
new file mode 100755
index 000000000..bbcd73c37
Binary files /dev/null and b/test/convolution/astronaut_level2.xv differ
diff --git a/test/convolution/astronaut_levellap0.xv b/test/convolution/astronaut_levellap0.xv
new file mode 100644
index 000000000..2e907593d
Binary files /dev/null and b/test/convolution/astronaut_levellap0.xv differ
diff --git a/test/convolution/astronaut_levellap1.xv b/test/convolution/astronaut_levellap1.xv
new file mode 100644
index 000000000..bc30047ca
Binary files /dev/null and b/test/convolution/astronaut_levellap1.xv differ
diff --git a/test/convolution/astronaut_levellap2.xv b/test/convolution/astronaut_levellap2.xv
new file mode 100644
index 000000000..7833ae582
Binary files /dev/null and b/test/convolution/astronaut_levellap2.xv differ
diff --git a/test/convolution/astronaut_simple_sharpening_orig.xv b/test/convolution/astronaut_simple_sharpening_orig.xv
new file mode 100644
index 000000000..ea58f5175
Binary files /dev/null and b/test/convolution/astronaut_simple_sharpening_orig.xv differ
diff --git a/test/convolution/astronauthessxx.xv b/test/convolution/astronauthessxx.xv
new file mode 100644
index 000000000..a99ab2ed8
Binary files /dev/null and b/test/convolution/astronauthessxx.xv differ
diff --git a/test/convolution/astronauthessxy.xv b/test/convolution/astronauthessxy.xv
new file mode 100644
index 000000000..6bf6de367
Binary files /dev/null and b/test/convolution/astronauthessxy.xv differ
diff --git a/test/convolution/astronauthessyy.xv b/test/convolution/astronauthessyy.xv
new file mode 100644
index 000000000..63d4db701
Binary files /dev/null and b/test/convolution/astronauthessyy.xv differ
diff --git a/test/convolution/astronautrgbst.xv b/test/convolution/astronautrgbst.xv
new file mode 100644
index 000000000..d0f4aa0f2
Binary files /dev/null and b/test/convolution/astronautrgbst.xv differ
diff --git a/test/convolution/astronautstxx.xv b/test/convolution/astronautstxx.xv
new file mode 100644
index 000000000..2411044ee
Binary files /dev/null and b/test/convolution/astronautstxx.xv differ
diff --git a/test/convolution/astronautstxy.xv b/test/convolution/astronautstxy.xv
new file mode 100644
index 000000000..1c1eebfc3
Binary files /dev/null and b/test/convolution/astronautstxy.xv differ
diff --git a/test/convolution/astronautstyy.xv b/test/convolution/astronautstyy.xv
new file mode 100644
index 000000000..715108c97
Binary files /dev/null and b/test/convolution/astronautstyy.xv differ
diff --git a/test/convolution/lenna128.xv b/test/convolution/lenna128.xv
deleted file mode 100644
index 11782b2b6..000000000
Binary files a/test/convolution/lenna128.xv and /dev/null differ
diff --git a/test/convolution/lenna128nonlinear.xv b/test/convolution/lenna128nonlinear.xv
deleted file mode 100644
index 559e83b00..000000000
Binary files a/test/convolution/lenna128nonlinear.xv and /dev/null differ
diff --git a/test/convolution/lenna128recgrad.xv b/test/convolution/lenna128recgrad.xv
deleted file mode 100644
index 2159ed5f8..000000000
Binary files a/test/convolution/lenna128recgrad.xv and /dev/null differ
diff --git a/test/convolution/lenna128rgb.xv b/test/convolution/lenna128rgb.xv
deleted file mode 100644
index 44dc30bf5..000000000
Binary files a/test/convolution/lenna128rgb.xv and /dev/null differ
diff --git a/test/convolution/lenna128rgbsepgrad.xv b/test/convolution/lenna128rgbsepgrad.xv
deleted file mode 100644
index d000c3c73..000000000
Binary files a/test/convolution/lenna128rgbsepgrad.xv and /dev/null differ
diff --git a/test/convolution/lenna128sepgrad.xv b/test/convolution/lenna128sepgrad.xv
deleted file mode 100644
index fcf0d760a..000000000
Binary files a/test/convolution/lenna128sepgrad.xv and /dev/null differ
diff --git a/test/convolution/lenna_gaussian_sharpening_orig.xv b/test/convolution/lenna_gaussian_sharpening_orig.xv
deleted file mode 100644
index e6eada7be..000000000
Binary files a/test/convolution/lenna_gaussian_sharpening_orig.xv and /dev/null differ
diff --git a/test/convolution/lenna_level-1.xv b/test/convolution/lenna_level-1.xv
deleted file mode 100644
index 09d53cd5c..000000000
Binary files a/test/convolution/lenna_level-1.xv and /dev/null differ
diff --git a/test/convolution/lenna_level-2.xv b/test/convolution/lenna_level-2.xv
deleted file mode 100644
index 263b8de9d..000000000
Binary files a/test/convolution/lenna_level-2.xv and /dev/null differ
diff --git a/test/convolution/lenna_level1.xv b/test/convolution/lenna_level1.xv
deleted file mode 100644
index ad3023a28..000000000
Binary files a/test/convolution/lenna_level1.xv and /dev/null differ
diff --git a/test/convolution/lenna_level2.xv b/test/convolution/lenna_level2.xv
deleted file mode 100644
index c4f12a1de..000000000
Binary files a/test/convolution/lenna_level2.xv and /dev/null differ
diff --git a/test/convolution/lenna_levellap0.xv b/test/convolution/lenna_levellap0.xv
deleted file mode 100644
index 3ad02c90a..000000000
Binary files a/test/convolution/lenna_levellap0.xv and /dev/null differ
diff --git a/test/convolution/lenna_levellap1.xv b/test/convolution/lenna_levellap1.xv
deleted file mode 100644
index 56c3dd463..000000000
Binary files a/test/convolution/lenna_levellap1.xv and /dev/null differ
diff --git a/test/convolution/lenna_levellap2.xv b/test/convolution/lenna_levellap2.xv
deleted file mode 100644
index 7a6518c5d..000000000
Binary files a/test/convolution/lenna_levellap2.xv and /dev/null differ
diff --git a/test/convolution/lenna_simple_sharpening_orig.xv b/test/convolution/lenna_simple_sharpening_orig.xv
deleted file mode 100644
index 1437a962e..000000000
Binary files a/test/convolution/lenna_simple_sharpening_orig.xv and /dev/null differ
diff --git a/test/convolution/lennahessxx.xv b/test/convolution/lennahessxx.xv
deleted file mode 100644
index b1be4b4e7..000000000
Binary files a/test/convolution/lennahessxx.xv and /dev/null differ
diff --git a/test/convolution/lennahessxy.xv b/test/convolution/lennahessxy.xv
deleted file mode 100644
index b5d39a9d5..000000000
Binary files a/test/convolution/lennahessxy.xv and /dev/null differ
diff --git a/test/convolution/lennahessyy.xv b/test/convolution/lennahessyy.xv
deleted file mode 100644
index 424ba0e5e..000000000
Binary files a/test/convolution/lennahessyy.xv and /dev/null differ
diff --git a/test/convolution/lennargbst.xv b/test/convolution/lennargbst.xv
deleted file mode 100644
index 152a0b589..000000000
Binary files a/test/convolution/lennargbst.xv and /dev/null differ
diff --git a/test/convolution/lennastxx.xv b/test/convolution/lennastxx.xv
deleted file mode 100644
index 9e8ec68ec..000000000
Binary files a/test/convolution/lennastxx.xv and /dev/null differ
diff --git a/test/convolution/lennastxy.xv b/test/convolution/lennastxy.xv
deleted file mode 100644
index 839a0cdba..000000000
Binary files a/test/convolution/lennastxy.xv and /dev/null differ
diff --git a/test/convolution/lennastyy.xv b/test/convolution/lennastyy.xv
deleted file mode 100644
index 8edd5f23b..000000000
Binary files a/test/convolution/lennastyy.xv and /dev/null differ
diff --git a/test/convolution/resampling.xv b/test/convolution/resampling.xv
index 7ca208fb8..30f0b86a8 100644
Binary files a/test/convolution/resampling.xv and b/test/convolution/resampling.xv differ
diff --git a/test/convolution/test.cxx b/test/convolution/test.cxx
index 87c1cc80d..d0e7dee46 100644
--- a/test/convolution/test.cxx
+++ b/test/convolution/test.cxx
@@ -133,10 +133,10 @@ struct ConvolutionTest
         line_kernel.initExplicitly(Diff2D(-2,0), Diff2D(2,0)) = 1, 4,   12,   4, 1 ;
         line_kernel.normalize(1);
 
-        ImageImportInfo info("lenna128.xv");
+        ImageImportInfo info("astronaut128.xv");
 
-        lenna.resize(info.width(), info.height());
-        importImage(info, destImage(lenna));
+        astronaut.resize(info.width(), info.height());
+        importImage(info, destImage(astronaut));
 
         Image::ScanOrderIterator i = rampimg.begin();
         Image::ScanOrderIterator end = rampimg.end();
@@ -338,17 +338,17 @@ struct ConvolutionTest
 
     void simpleSharpeningTest()
     {
-        Image dest_lenna(lenna);
-        simpleSharpening(srcImageRange(lenna), destImage(dest_lenna), 0.8);
+        Image dest_astronaut(astronaut);
+        simpleSharpening(srcImageRange(astronaut), destImage(dest_astronaut), 0.8);
 
         Image dest_correct;
-        ImageImportInfo info_correct("lenna_simple_sharpening_orig.xv");
+        ImageImportInfo info_correct("astronaut_simple_sharpening_orig.xv");
         dest_correct.resize(info_correct.width(), info_correct.height());
         importImage(info_correct, destImage(dest_correct));
 
-        Image::iterator i_dest = dest_lenna.begin();
-        Image::iterator end_dest = dest_lenna.end();
-        Image::Accessor acc_dest = dest_lenna.accessor();
+        Image::iterator i_dest = dest_astronaut.begin();
+        Image::iterator end_dest = dest_astronaut.end();
+        Image::Accessor acc_dest = dest_astronaut.accessor();
         Image::iterator i_dest_correct = dest_correct.begin();
         Image::Accessor acc_dest_correct = dest_correct.accessor();
 
@@ -356,26 +356,26 @@ struct ConvolutionTest
             shouldEqualTolerance(acc_dest(i_dest) , acc_dest_correct(i_dest_correct), 1e-15);
         }
 
-        dest_lenna.init(0.0);
-        simpleSharpening(View(lenna), View(dest_lenna), 0.8);
+        dest_astronaut.init(0.0);
+        simpleSharpening(View(astronaut), View(dest_astronaut), 0.8);
 
         using namespace multi_math;
-        should(all(abs(View(dest_lenna) - View(dest_correct)) < 3e-13));
+        should(all(abs(View(dest_astronaut) - View(dest_correct)) < 3e-13));
     }
 
     void gaussianSharpeningTest()
     {
-        Image dest_lenna(lenna);
-        gaussianSharpening(srcImageRange(lenna), destImage(dest_lenna), 3., 0.7);
+        Image dest_astronaut(astronaut);
+        gaussianSharpening(srcImageRange(astronaut), destImage(dest_astronaut), 3., 0.7);
 
         Image dest_correct;
-        ImageImportInfo info_correct("lenna_gaussian_sharpening_orig.xv");
+        ImageImportInfo info_correct("astronaut_gaussian_sharpening_orig.xv");
         dest_correct.resize(info_correct.width(), info_correct.height());
         importImage(info_correct, destImage(dest_correct));
 
-        Image::iterator i_dest = dest_lenna.begin();
-        Image::iterator end_dest = dest_lenna.end();
-        Image::Accessor acc_dest = dest_lenna.accessor();
+        Image::iterator i_dest = dest_astronaut.begin();
+        Image::iterator end_dest = dest_astronaut.end();
+        Image::Accessor acc_dest = dest_astronaut.accessor();
         Image::iterator i_dest_correct = dest_correct.begin();
         Image::Accessor acc_dest_correct = dest_correct.accessor();
 
@@ -384,11 +384,11 @@ struct ConvolutionTest
             shouldEqualTolerance(acc_dest(i_dest) , acc_dest_correct(i_dest_correct), 1e-6);
         }
 
-        dest_lenna.init(0.0);
-        gaussianSharpening(View(lenna), View(dest_lenna), 3., 0.7);
+        dest_astronaut.init(0.0);
+        gaussianSharpening(View(astronaut), View(dest_astronaut), 3., 0.7);
 
         using namespace multi_math;
-        should(all(abs(View(dest_lenna) - View(dest_correct)) < 1e-6));
+        should(all(abs(View(dest_astronaut) - View(dest_correct)) < 1e-6));
     }
 
     void stdConvolutionTestOnConstImage()
@@ -444,9 +444,9 @@ struct ConvolutionTest
 
 
         //@todo Import<->Export funktioniert nicht wie frueher???
-//         Image dest_lenna(lenna);
-//         convolveImage(srcImageRange(lenna), destImage(dest_lenna), kernel2d(sym_kernel, BORDER_TREATMENT_REFLECT));
-//         exportImage(srcImageRange(dest_lenna), ImageExportInfo("lenna_convolve_128x120.xv"));
+//         Image dest_astronaut(astronaut);
+//         convolveImage(srcImageRange(astronaut), destImage(dest_astronaut), kernel2d(sym_kernel, BORDER_TREATMENT_REFLECT));
+//         exportImage(srcImageRange(dest_astronaut), ImageExportInfo("astronaut_convolve_128x120.xv"));
 
     }
 
@@ -960,12 +960,12 @@ struct ConvolutionTest
         gauss.initGaussian(scale);
         gauss.setBorderTreatment(BORDER_TREATMENT_REFLECT);
 
-        Image tmp1(lenna.size()), tmp2(lenna.size()), tmp3(lenna.size());
+        Image tmp1(astronaut.size()), tmp2(astronaut.size()), tmp3(astronaut.size());
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp1), kernel1d(gauss));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp1), kernel1d(gauss));
         separableConvolveY(srcImageRange(tmp1), destImage(tmp2), kernel1d(gauss));
 
-        gaussianSmoothing(srcImageRange(lenna), destImage(tmp1), scale);
+        gaussianSmoothing(srcImageRange(astronaut), destImage(tmp1), scale);
 
         Image::ScanOrderIterator i1 = tmp1.begin();
         Image::ScanOrderIterator i1end = tmp1.end();
@@ -978,15 +978,15 @@ struct ConvolutionTest
         }
 
         tmp1 = 0.0;
-        separableConvolveX(View(lenna), View(tmp1), gauss);
+        separableConvolveX(View(astronaut), View(tmp1), gauss);
         separableConvolveY(View(tmp1), View(tmp3),  gauss);
-        gaussianSmoothing(View(lenna), View(tmp1), scale);
+        gaussianSmoothing(View(astronaut), View(tmp1), scale);
         should(View(tmp1) == View(tmp2));
         should(View(tmp1) == View(tmp3));
 
         // test recursive approximation
-        Image recursive(lenna.size());
-        recursiveGaussianFilterX(srcImageRange(lenna), destImage(tmp2), scale);
+        Image recursive(astronaut.size());
+        recursiveGaussianFilterX(srcImageRange(astronaut), destImage(tmp2), scale);
         recursiveGaussianFilterY(srcImageRange(tmp2), destImage(recursive), scale);
 
         i1 = tmp1.begin();
@@ -998,11 +998,11 @@ struct ConvolutionTest
         {
             double diff = abs(acc(i1) - acc(i2));
             sum += diff;
-            should(diff < 6.0);
+            should(diff < 11.0);
         }
-        should(sum / lenna.width() / lenna.height() < 0.5);
+        should(sum / astronaut.width() / astronaut.height() < 0.9);
 
-        recursiveGaussianFilterX(View(lenna), View(tmp1), scale);
+        recursiveGaussianFilterX(View(astronaut), View(tmp1), scale);
         recursiveGaussianFilterY(View(tmp1), View(tmp2), scale);
         should(View(recursive) == View(tmp2));
     }
@@ -1012,13 +1012,13 @@ struct ConvolutionTest
         vigra::Kernel1D<double> smooth3;
         smooth3.initOptimalSmoothing3();
 
-        Image tmp1(lenna.size());
-        Image tmp2(lenna.size());
+        Image tmp1(astronaut.size());
+        Image tmp2(astronaut.size());
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp1), kernel1d(smooth3));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp1), kernel1d(smooth3));
         separableConvolveY(srcImageRange(tmp1), destImage(tmp2), kernel1d(smooth3));
 
-        gaussianSmoothing(srcImageRange(lenna), destImage(tmp1), 0.68);
+        gaussianSmoothing(srcImageRange(astronaut), destImage(tmp1), 0.68);
 
         Image::ScanOrderIterator i1 = tmp1.begin();
         Image::ScanOrderIterator i1end = tmp1.end();
@@ -1027,7 +1027,7 @@ struct ConvolutionTest
 
         for(; i1 != i1end; ++i1, ++i2)
         {
-            shouldEqualTolerance(acc(i1), acc(i2), 1e-2);
+            shouldEqualTolerance(acc(i1), acc(i2), 1e-1);
         }
     }
 
@@ -1036,13 +1036,13 @@ struct ConvolutionTest
         vigra::Kernel1D<double> smooth5;
         smooth5.initOptimalSmoothing5();
 
-        Image tmp1(lenna.size());
-        Image tmp2(lenna.size());
+        Image tmp1(astronaut.size());
+        Image tmp2(astronaut.size());
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp1), kernel1d(smooth5));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp1), kernel1d(smooth5));
         separableConvolveY(srcImageRange(tmp1), destImage(tmp2), kernel1d(smooth5));
 
-        gaussianSmoothing(srcImageRange(lenna), destImage(tmp1), 0.867);
+        gaussianSmoothing(srcImageRange(astronaut), destImage(tmp1), 0.867);
 
         Image::ScanOrderIterator i1 = tmp1.begin();
         Image::ScanOrderIterator i1end = tmp1.end();
@@ -1051,30 +1051,30 @@ struct ConvolutionTest
 
         for(; i1 != i1end; ++i1, ++i2)
         {
-            shouldEqualTolerance(acc(i1), acc(i2), 1e-2);
+            shouldEqualTolerance(acc(i1), acc(i2), 1e-1);
         }
     }
 
     void separableGradientTest()
     {
-        Image sepgrad(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128sepgrad.xv"), destImage(sepgrad));
+        Image sepgrad(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128sepgrad.xv"), destImage(sepgrad));
 
         vigra::Kernel1D<double> gauss;
         gauss.initGaussian(1.0);
         vigra::Kernel1D<double> grad;
         grad.initGaussianDerivative(1.0, 1);
 
-        Image tmp1(lenna);
+        Image tmp1(astronaut);
         tmp1.init(0.0);
-        Image tmp2(lenna);
+        Image tmp2(astronaut);
         tmp2.init(0.0);
-        Image tmp3(lenna);
+        Image tmp3(astronaut);
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp3), kernel1d(grad));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp3), kernel1d(grad));
         separableConvolveY(srcImageRange(tmp3), destImage(tmp1), kernel1d(gauss));
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp3), kernel1d(gauss));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp3), kernel1d(gauss));
         separableConvolveY(srcImageRange(tmp3), destImage(tmp2), kernel1d(grad));
 
         Image::ScanOrderIterator i1 = tmp1.begin();
@@ -1093,29 +1093,29 @@ struct ConvolutionTest
         // compare with 2D convolution
         vigra::Kernel2D<double> gradx;
         gradx.initSeparable(grad, gauss);
-        Image nsgrad(lenna.size());
-        convolveImage(srcImageRange(lenna), destImage(nsgrad), kernel2d(gradx));
+        Image nsgrad(astronaut.size());
+        convolveImage(srcImageRange(astronaut), destImage(nsgrad), kernel2d(gradx));
 
         using namespace vigra::functor;
 
         combineTwoImages(srcImageRange(nsgrad), srcImage(tmp1), destImage(nsgrad), Arg1() - Arg2());
-        Image zero(lenna.size(), 0.0);
+        Image zero(astronaut.size(), 0.0);
         shouldEqualSequenceTolerance(nsgrad.data(), nsgrad.data()+nsgrad.width()*nsgrad.height(),
                                      zero.data(), 1e-12);
     }
 
     void gradientTest()
     {
-        Image sepgrad(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128sepgrad.xv"), destImage(sepgrad));
+        Image sepgrad(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128sepgrad.xv"), destImage(sepgrad));
 
 
-        Image tmpx(lenna.size());
-        Image tmpy(lenna.size());
-        Image mag(lenna.size());
+        Image tmpx(astronaut.size());
+        Image tmpy(astronaut.size());
+        Image mag(astronaut.size());
 
-        gaussianGradient(View(lenna), View(tmpx), View(tmpy), 1.0);
-        gaussianGradientMagnitude(srcImageRange(lenna), destImage(mag), 1.0);
+        gaussianGradient(View(astronaut), View(tmpx), View(tmpy), 1.0);
+        gaussianGradientMagnitude(srcImageRange(astronaut), destImage(mag), 1.0);
 
         Image::ScanOrderIterator i1 = tmpx.begin();
         Image::ScanOrderIterator i1end = tmpx.end();
@@ -1134,19 +1134,19 @@ struct ConvolutionTest
 
     void optimalGradient3Test()
     {
-        Image tmp(lenna.size());
-        Image tmpx(lenna.size());
-        Image tmpy(lenna.size());
+        Image tmp(astronaut.size());
+        Image tmpx(astronaut.size());
+        Image tmpy(astronaut.size());
 
         vigra::Kernel1D<double> diff;
         diff.initSymmetricDifference();
         vigra::Kernel1D<double> smooth3;
         smooth3.initOptimalFirstDerivativeSmoothing3();
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(diff));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(diff));
         separableConvolveY(srcImageRange(tmp), destImage(tmpx), kernel1d(smooth3));
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(smooth3));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(smooth3));
         separableConvolveY(srcImageRange(tmp), destImage(tmpy), kernel1d(diff));
 
         double sum = 0.0, mi = 0.0, ma = 0.0;
@@ -1163,26 +1163,27 @@ struct ConvolutionTest
             mi = std::min(mi, grad);
             ma = std::max(ma, grad);
         }
-        should(std::fabs(sum- 130000.0) < 1000.0);
+
+        should(std::fabs(sum - 205000.0) < 1000.0);
         shouldEqual(mi, 0.0);
-        should(std::fabs(ma - 68.0) < 1.0);
+        should(std::fabs(ma - 101.0) < 1.0);
     }
 
     void optimalLaplacian3Test()
     {
-        Image tmp(lenna.size());
-        Image tmpx(lenna.size());
-        Image tmpy(lenna.size());
+        Image tmp(astronaut.size());
+        Image tmpx(astronaut.size());
+        Image tmpy(astronaut.size());
 
         vigra::Kernel1D<double> diff;
         diff.initSecondDifference3();
         vigra::Kernel1D<double> smooth3;
         smooth3.initOptimalSecondDerivativeSmoothing3();
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(diff));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(diff));
         separableConvolveY(srcImageRange(tmp), destImage(tmpx), kernel1d(smooth3));
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(smooth3));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(smooth3));
         separableConvolveY(srcImageRange(tmp), destImage(tmpy), kernel1d(diff));
 
         double sum = 0.0, mi = 0.0, ma = 0.0;
@@ -1199,69 +1200,69 @@ struct ConvolutionTest
             mi = std::min(mi, lap);
             ma = std::max(ma, lap);
         }
-        should(std::fabs(sum) < 90.0);
-        should(std::fabs(mi + 120.0) < 1.0);
-        should(std::fabs(ma - 117.0) < 1.0);
+        should(std::fabs(sum) < 32.0);
+        should(std::fabs(mi + 256.0) < 1.0);
+        should(std::fabs(ma - 235.0) < 1.0);
     }
 
     void optimalGradient5Test()
     {
-        Image tmp(lenna.size());
-        Image tmpx(lenna.size());
-        Image tmpy(lenna.size());
-        Image mag(lenna.size());
+        Image tmp(astronaut.size());
+        Image tmpx(astronaut.size());
+        Image tmpy(astronaut.size());
+        Image mag(astronaut.size());
 
         vigra::Kernel1D<double> diff;
         diff.initOptimalFirstDerivative5();
         vigra::Kernel1D<double> smooth5;
         smooth5.initOptimalFirstDerivativeSmoothing5();
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(diff));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(diff));
         separableConvolveY(srcImageRange(tmp), destImage(tmpx), kernel1d(smooth5));
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(smooth5));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(smooth5));
         separableConvolveY(srcImageRange(tmp), destImage(tmpy), kernel1d(diff));
 
-        gaussianGradientMagnitude(srcImageRange(lenna), destImage(mag), 0.906);
+        gaussianGradientMagnitude(srcImageRange(astronaut), destImage(mag), 0.906);
 
-        for(int y=1; y<lenna.height()-1; ++y)
+        for(int y=1; y<astronaut.height()-1; ++y)
         {
-            for(int x=1; x<lenna.width()-1; ++x)
+            for(int x=1; x<astronaut.width()-1; ++x)
             {
                 double grad = vigra::hypot(tmpx(x,y), tmpy(x,y));
-                should(std::fabs(grad-mag(x,y)) < 2.0);
+                should(std::fabs(grad-mag(x,y)) < 3.0);
             }
         }
     }
 
     void optimalLaplacian5Test()
     {
-        Image tmp(lenna.size());
-        Image tmpx(lenna.size());
-        Image tmpy(lenna.size());
-        Image lap(lenna.size());
-        Image lap1(lenna.size());
+        Image tmp(astronaut.size());
+        Image tmpx(astronaut.size());
+        Image tmpy(astronaut.size());
+        Image lap(astronaut.size());
+        Image lap1(astronaut.size());
 
         vigra::Kernel1D<double> diff;
         diff.initOptimalSecondDerivative5();
         vigra::Kernel1D<double> smooth5;
         smooth5.initOptimalSecondDerivativeSmoothing5();
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp), kernel1d(diff));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp), kernel1d(diff));
         separableConvolveY(srcImageRange(tmp), destImage(tmpx), kernel1d(smooth5));
 
-        separableConvolveX(View(lenna), View(tmp), smooth5);
+        separableConvolveX(View(astronaut), View(tmp), smooth5);
         separableConvolveY(View(tmp), View(tmpy), diff);
 
-        laplacianOfGaussian(srcImageRange(lenna), destImage(lap), 0.817);
-        laplacianOfGaussian(View(lenna), View(lap1), 0.817);
+        laplacianOfGaussian(srcImageRange(astronaut), destImage(lap), 0.817);
+        laplacianOfGaussian(View(astronaut), View(lap1), 0.817);
 
-        for(int y=2; y<lenna.height()-2; ++y)
+        for(int y=2; y<astronaut.height()-2; ++y)
         {
-            for(int x=2; x<lenna.width()-2; ++x)
+            for(int x=2; x<astronaut.width()-2; ++x)
             {
                 double l = tmpx(x,y) + tmpy(x,y);
-                should(std::fabs(l-lap(x,y)) < 4.0);
+                should(std::fabs(l-lap(x,y)) < 6.0);
                 shouldEqual(lap(x,y), lap1(x,y));
             }
         }
@@ -1269,17 +1270,16 @@ struct ConvolutionTest
 
     void gradientRGBTest()
     {
-        RGBImage input(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128rgb.xv"), destImage(input));
-
-        Image sepgrad(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128rgbsepgrad.xv"), destImage(sepgrad));
+        RGBImage input(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128rgb.xv"), destImage(input));
 
+        Image sepgrad(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128rgbsepgrad.xv"), destImage(sepgrad));
 
-        RGBImage tmpx(lenna.size());
-        RGBImage tmpy(lenna.size());
-        Image mag(lenna.size());
-        Image resmag(lenna.size());
+        RGBImage tmpx(astronaut.size());
+        RGBImage tmpy(astronaut.size());
+        Image mag(astronaut.size());
+        Image resmag(astronaut.size());
 
         gaussianGradient(srcImageRange(input), destImage(tmpx), destImage(tmpy), 1.0);
         gaussianGradientMagnitude(srcImageRange(input), destImage(mag), 1.0);
@@ -1303,19 +1303,19 @@ struct ConvolutionTest
 
     void hessianTest()
     {
-        Image refxx(lenna.size());
-        Image refxy(lenna.size());
-        Image refyy(lenna.size());
+        Image refxx(astronaut.size());
+        Image refxy(astronaut.size());
+        Image refyy(astronaut.size());
 
-        importImage(vigra::ImageImportInfo("lennahessxx.xv"), destImage(refxx));
-        importImage(vigra::ImageImportInfo("lennahessyy.xv"), destImage(refyy));
-        importImage(vigra::ImageImportInfo("lennahessxy.xv"), destImage(refxy));
+        importImage(vigra::ImageImportInfo("astronauthessxx.xv"), destImage(refxx));
+        importImage(vigra::ImageImportInfo("astronauthessyy.xv"), destImage(refyy));
+        importImage(vigra::ImageImportInfo("astronauthessxy.xv"), destImage(refxy));
         {
-            Image resxx(lenna.size());
-            Image resxy(lenna.size());
-            Image resyy(lenna.size());
+            Image resxx(astronaut.size());
+            Image resxy(astronaut.size());
+            Image resyy(astronaut.size());
 
-            hessianMatrixOfGaussian(srcImageRange(lenna),
+            hessianMatrixOfGaussian(srcImageRange(astronaut),
                 destImage(resxx), destImage(resxy), destImage(resyy), 1.0);
 
             Image::ScanOrderIterator i1 = resxx.begin();
@@ -1336,11 +1336,11 @@ struct ConvolutionTest
             }
         }
         {
-            Image resxx(lenna.size());
-            Image resxy(lenna.size());
-            Image resyy(lenna.size());
+            Image resxx(astronaut.size());
+            Image resxy(astronaut.size());
+            Image resyy(astronaut.size());
 
-            hessianMatrixOfGaussian(View(lenna),
+            hessianMatrixOfGaussian(View(astronaut),
                                     View(resxx), View(resxy), View(resyy), 1.0);
 
             Image::ScanOrderIterator i1 = resxx.begin();
@@ -1364,24 +1364,24 @@ struct ConvolutionTest
 
     void structureTensorTest()
     {
-        Image resxx(lenna.size());
-        Image resxy(lenna.size());
-        Image resyy(lenna.size());
-        Image refxx(lenna.size());
-        Image refxy(lenna.size());
-        Image refyy(lenna.size());
+        Image resxx(astronaut.size());
+        Image resxy(astronaut.size());
+        Image resyy(astronaut.size());
+        Image refxx(astronaut.size());
+        Image refxy(astronaut.size());
+        Image refyy(astronaut.size());
 
         typedef BasicImage<TinyVector<double, 3> > VectorImage;
-        VectorImage resst(lenna.size());
+        VectorImage resst(astronaut.size());
 
-        structureTensor(View(lenna),
+        structureTensor(View(astronaut),
                         View(resxx), View(resxy), View(resyy), 1.0, 2.0);
 
-        structureTensor(View(lenna), MultiArrayView<2, TinyVector<double, 3> >(resst), 1.0, 2.0);
+        structureTensor(View(astronaut), MultiArrayView<2, TinyVector<double, 3> >(resst), 1.0, 2.0);
 
-        importImage(vigra::ImageImportInfo("lennastxx.xv"), destImage(refxx));
-        importImage(vigra::ImageImportInfo("lennastyy.xv"), destImage(refyy));
-        importImage(vigra::ImageImportInfo("lennastxy.xv"), destImage(refxy));
+        importImage(vigra::ImageImportInfo("astronautstxx.xv"), destImage(refxx));
+        importImage(vigra::ImageImportInfo("astronautstyy.xv"), destImage(refyy));
+        importImage(vigra::ImageImportInfo("astronautstxy.xv"), destImage(refxy));
 
         Image::ScanOrderIterator i1 = resxx.begin();
         Image::ScanOrderIterator i1end = resxx.end();
@@ -1407,15 +1407,14 @@ struct ConvolutionTest
 
     void structureTensorRGBTest()
     {
-        RGBImage input(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128rgb.xv"), destImage(input));
+        RGBImage input(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128rgb.xv"), destImage(input));
 
         typedef BasicImage<TinyVector<double, 3> > VectorImage;
-        VectorImage resst(lenna.size()), refst(lenna.size());
-
-        structureTensor(srcImageRange(lenna), destImage(resst), 1.0, 2.0);
+        VectorImage resst(astronaut.size()), refst(astronaut.size());
 
-        importImage(vigra::ImageImportInfo("lennargbst.xv"), destImage(refst));
+        structureTensor(srcImageRange(astronaut), destImage(resst), 1.0, 2.0);
+        importImage(vigra::ImageImportInfo("astronautrgbst.xv"), destImage(refst));
 
         VectorImage::ScanOrderIterator i1 = resst.begin();
         VectorImage::ScanOrderIterator i1end = resst.end();
@@ -1463,16 +1462,16 @@ struct ConvolutionTest
         vigra::Kernel2D<double> gauss2;
         gauss2.initSeparable(gauss1, gauss1);
 
-        Image tmp1(lenna);
+        Image tmp1(astronaut);
         tmp1 = 0.0;
 
-        convolveImage(srcImageRange(lenna), destImage(tmp1), kernel2d(gauss2));
+        convolveImage(srcImageRange(astronaut), destImage(tmp1), kernel2d(gauss2));
 
-        Image tmp2(lenna);
-        Image tmp3(lenna);
+        Image tmp2(astronaut);
+        Image tmp3(astronaut);
         tmp3 = 0.0;
 
-        separableConvolveX(srcImageRange(lenna), destImage(tmp2), kernel1d(gauss1));
+        separableConvolveX(srcImageRange(astronaut), destImage(tmp2), kernel1d(gauss1));
         separableConvolveY(srcImageRange(tmp2), destImage(tmp3), kernel1d(gauss1));
 
         Image::Iterator y1 = tmp1.upperLeft() - gauss2.upperLeft();
@@ -2075,20 +2074,20 @@ struct ConvolutionTest
 
     void recursiveGradientTest()
     {
-        ImageImportInfo info("lenna128recgrad.xv");
+        ImageImportInfo info("astronaut128recgrad.xv");
 
         Image recgrad(info.width(), info.height());
         importImage(info, destImage(recgrad));
 
-        Image tmp1(lenna);
+        Image tmp1(astronaut);
         tmp1 = 0.0;
-        Image tmp2(lenna);
+        Image tmp2(astronaut);
         tmp2 = 0.0;
 
-        recursiveFirstDerivativeX(View(lenna), View(tmp1), 1.0);
+        recursiveFirstDerivativeX(View(astronaut), View(tmp1), 1.0);
         recursiveSmoothY(View(tmp1), View(tmp1), 1.0);
 
-        recursiveSmoothX(View(lenna), View(tmp2), 1.0);
+        recursiveSmoothX(View(astronaut), View(tmp2), 1.0);
         recursiveFirstDerivativeY(View(tmp2), View(tmp2), 1.0);
 
         Image::ScanOrderIterator i1 = tmp1.begin();
@@ -2134,22 +2133,22 @@ struct ConvolutionTest
     void nonlinearDiffusionTest()
     {
 
-        Image res(lenna.size());
+        Image res(astronaut.size());
 
-        Image comp(lenna.size());
-        importImage(vigra::ImageImportInfo("lenna128nonlinear.xv"), destImage(comp));
+        Image comp(astronaut.size());
+        importImage(vigra::ImageImportInfo("astronaut128nonlinear.xv"), destImage(comp));
 
-        nonlinearDiffusion(srcImageRange(lenna), destImage(res),
+        nonlinearDiffusion(srcImageRange(astronaut), destImage(res),
                            vigra::DiffusivityFunctor<double>(4.0), 4.0);
         shouldEqualSequenceTolerance(res.begin(), res.end(), comp.begin(), 1e-7);
 
         res = 0;
-        nonlinearDiffusion(View(lenna), View(res),
+        nonlinearDiffusion(View(astronaut), View(res),
                            vigra::DiffusivityFunctor<double>(4.0), 4.0);
         shouldEqualSequenceTolerance(res.begin(), res.end(), comp.begin(), 1e-7);
     }
 
-    Image constimg, lenna, rampimg, sym_image, unsym_image;
+    Image constimg, astronaut, rampimg, sym_image, unsym_image;
     vigra::Kernel2D<double> sym_kernel, unsym_kernel, line_kernel;
 
 };
@@ -2260,7 +2259,7 @@ struct ResamplingConvolutionTest
         Gaussian<double> gauss(0.7);
         Rational<int> samplingRatio(2,1), offset(1,4);
 
-        ImageImportInfo info("lenna128.xv");
+        ImageImportInfo info("astronaut128.xv");
         FImage img(info.size());
         importImage(info, destImage(img));
 
@@ -2290,7 +2289,7 @@ struct ImagePyramidTest
 
     ImagePyramidTest()
     {
-        ImageImportInfo ginfo("lenna128.xv");
+        ImageImportInfo ginfo("astronaut128.xv");
         w = ginfo.width();
         h = ginfo.height();
         img.resize(w, h);
@@ -2324,7 +2323,7 @@ struct ImagePyramidTest
             if(i==0)
                 continue;
 
-            std::sprintf(buf, "lenna_level%d.xv", i);
+            std::sprintf(buf, "astronaut_level%d.xv", i);
             ImageImportInfo info(buf);
             shouldEqual(info.size(), pyramid[i].size());
 
@@ -2335,7 +2334,7 @@ struct ImagePyramidTest
 
         for(int i=0; i<=2; ++i)
         {
-            std::sprintf(buf, "lenna_levellap%d.xv", i);
+            std::sprintf(buf, "astronaut_levellap%d.xv", i);
             ImageImportInfo info(buf);
             shouldEqual(info.size(), laplacian[i].size());
 
diff --git a/test/image/CMakeLists.txt b/test/image/CMakeLists.txt
index a1a6813b8..8579d8e33 100644
--- a/test/image/CMakeLists.txt
+++ b/test/image/CMakeLists.txt
@@ -1,3 +1,3 @@
 VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex)
 
-VIGRA_COPY_TEST_DATA(lenna.xv)
+VIGRA_COPY_TEST_DATA(astronaut.xv)
diff --git a/test/image/astronaut.xv b/test/image/astronaut.xv
new file mode 100644
index 000000000..f7b5b9561
Binary files /dev/null and b/test/image/astronaut.xv differ
diff --git a/test/image/lenna.gif b/test/image/lenna.gif
deleted file mode 100644
index 525fa72e9..000000000
Binary files a/test/image/lenna.gif and /dev/null differ
diff --git a/test/image/lenna.xv b/test/image/lenna.xv
deleted file mode 100644
index 03ec3f49b..000000000
Binary files a/test/image/lenna.xv and /dev/null differ
diff --git a/test/image/test.cxx b/test/image/test.cxx
index 0ee381398..0c484c9d8 100644
--- a/test/image/test.cxx
+++ b/test/image/test.cxx
@@ -506,26 +506,26 @@ struct ImageContainerTests
 {
     ImageImportInfo info;
     int w, h;
-    FImage lennaImage;
+    FImage astronautImage;
 
     ImageContainerTests()
-        : info("lenna.xv"),
+        : info("astronaut.xv"),
           w(info.width()), h(info.height()),
-          lennaImage(w, h)
+          astronautImage(w, h)
     {
-        importImage(info, destImage(lennaImage));
+        importImage(info, destImage(astronautImage));
     }
 
     void initArrayWithImageTest()
     {
-        ImageArray<FImage> threeLennas(3, lennaImage);
+        ImageArray<FImage> threeAstronauts(3, astronautImage);
         CompareFunctor cmp;
-        inspectTwoImages(srcImageRange(threeLennas[0]), srcImage(threeLennas[2]), cmp);
+        inspectTwoImages(srcImageRange(threeAstronauts[0]), srcImage(threeAstronauts[2]), cmp);
         shouldEqual(cmp(), 0.0);
 
         Diff2D newsize(50, 50);
-        threeLennas.resizeImages(newsize);
-        for (ImageArray<FImage>::iterator it= threeLennas.begin(); it!= threeLennas.end(); it++)
+        threeAstronauts.resizeImages(newsize);
+        for (ImageArray<FImage>::iterator it= threeAstronauts.begin(); it!= threeAstronauts.end(); it++)
             shouldEqual((*it).size(), newsize);
     }
 
diff --git a/test/imgproc/CMakeLists.txt b/test/imgproc/CMakeLists.txt
index 4d6759ad6..c9099057f 100644
--- a/test/imgproc/CMakeLists.txt
+++ b/test/imgproc/CMakeLists.txt
@@ -1,3 +1,3 @@
 VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex)
 
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv lennargb42IIR.xv lenna_rotate.xv)
+VIGRA_COPY_TEST_DATA(astronaut128.xv astronaut128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv astronaut42lin.xv astronaut288neu.xv astronaut42neu.xv astronaut288rgbneu.xv astronaut42rgbneu.xv astronaut367FIR.xv astronaut42FIR.xv astronaut367IIR.xv astronaut42IIR.xv astronaut42linrgb.xv astronautrgb42FIR.xv astronautrgb42IIR.xv astronaut_rotate.xv)
diff --git a/test/imgproc/astronaut128.xv b/test/imgproc/astronaut128.xv
new file mode 100644
index 000000000..7348368b3
Binary files /dev/null and b/test/imgproc/astronaut128.xv differ
diff --git a/test/imgproc/astronaut128rgb.xv b/test/imgproc/astronaut128rgb.xv
new file mode 100644
index 000000000..cc6b9b2dc
Binary files /dev/null and b/test/imgproc/astronaut128rgb.xv differ
diff --git a/test/imgproc/astronaut288neu.xv b/test/imgproc/astronaut288neu.xv
new file mode 100644
index 000000000..f14cace57
Binary files /dev/null and b/test/imgproc/astronaut288neu.xv differ
diff --git a/test/imgproc/astronaut288rgbneu.xv b/test/imgproc/astronaut288rgbneu.xv
new file mode 100644
index 000000000..3304d4a60
Binary files /dev/null and b/test/imgproc/astronaut288rgbneu.xv differ
diff --git a/test/imgproc/astronaut367FIR.xv b/test/imgproc/astronaut367FIR.xv
new file mode 100644
index 000000000..b7680939a
Binary files /dev/null and b/test/imgproc/astronaut367FIR.xv differ
diff --git a/test/imgproc/astronaut367IIR.xv b/test/imgproc/astronaut367IIR.xv
new file mode 100644
index 000000000..04c8ecc50
Binary files /dev/null and b/test/imgproc/astronaut367IIR.xv differ
diff --git a/test/imgproc/astronaut42FIR.xv b/test/imgproc/astronaut42FIR.xv
new file mode 100644
index 000000000..b7680939a
Binary files /dev/null and b/test/imgproc/astronaut42FIR.xv differ
diff --git a/test/imgproc/astronaut42IIR.xv b/test/imgproc/astronaut42IIR.xv
new file mode 100644
index 000000000..04c8ecc50
Binary files /dev/null and b/test/imgproc/astronaut42IIR.xv differ
diff --git a/test/imgproc/astronaut42lin.xv b/test/imgproc/astronaut42lin.xv
new file mode 100644
index 000000000..a55097643
Binary files /dev/null and b/test/imgproc/astronaut42lin.xv differ
diff --git a/test/imgproc/astronaut42linrgb.xv b/test/imgproc/astronaut42linrgb.xv
new file mode 100644
index 000000000..4bc503193
Binary files /dev/null and b/test/imgproc/astronaut42linrgb.xv differ
diff --git a/test/imgproc/astronaut42neu.xv b/test/imgproc/astronaut42neu.xv
new file mode 100644
index 000000000..8fb136665
Binary files /dev/null and b/test/imgproc/astronaut42neu.xv differ
diff --git a/test/imgproc/astronaut42rgbneu.xv b/test/imgproc/astronaut42rgbneu.xv
new file mode 100644
index 000000000..1b76ef8a4
Binary files /dev/null and b/test/imgproc/astronaut42rgbneu.xv differ
diff --git a/test/imgproc/astronaut_rotate.xv b/test/imgproc/astronaut_rotate.xv
new file mode 100644
index 000000000..6ce67bcf4
Binary files /dev/null and b/test/imgproc/astronaut_rotate.xv differ
diff --git a/test/imgproc/astronautrgb42FIR.xv b/test/imgproc/astronautrgb42FIR.xv
new file mode 100644
index 000000000..0f7f72a7b
Binary files /dev/null and b/test/imgproc/astronautrgb42FIR.xv differ
diff --git a/test/imgproc/astronautrgb42IIR.xv b/test/imgproc/astronautrgb42IIR.xv
new file mode 100644
index 000000000..1b76ef8a4
Binary files /dev/null and b/test/imgproc/astronautrgb42IIR.xv differ
diff --git a/test/imgproc/lenna128.xv b/test/imgproc/lenna128.xv
deleted file mode 100644
index 11782b2b6..000000000
Binary files a/test/imgproc/lenna128.xv and /dev/null differ
diff --git a/test/imgproc/lenna128rgb.xv b/test/imgproc/lenna128rgb.xv
deleted file mode 100644
index 44dc30bf5..000000000
Binary files a/test/imgproc/lenna128rgb.xv and /dev/null differ
diff --git a/test/imgproc/lenna288.xv b/test/imgproc/lenna288.xv
deleted file mode 100644
index 8d9047988..000000000
Binary files a/test/imgproc/lenna288.xv and /dev/null differ
diff --git a/test/imgproc/lenna288neu.xv b/test/imgproc/lenna288neu.xv
deleted file mode 100644
index bf3b38362..000000000
Binary files a/test/imgproc/lenna288neu.xv and /dev/null differ
diff --git a/test/imgproc/lenna288rgb.xv b/test/imgproc/lenna288rgb.xv
deleted file mode 100644
index caaa35f4c..000000000
Binary files a/test/imgproc/lenna288rgb.xv and /dev/null differ
diff --git a/test/imgproc/lenna288rgbneu.xv b/test/imgproc/lenna288rgbneu.xv
deleted file mode 100644
index fef86ed88..000000000
Binary files a/test/imgproc/lenna288rgbneu.xv and /dev/null differ
diff --git a/test/imgproc/lenna367FIR.xv b/test/imgproc/lenna367FIR.xv
deleted file mode 100644
index db09bea1a..000000000
Binary files a/test/imgproc/lenna367FIR.xv and /dev/null differ
diff --git a/test/imgproc/lenna367IIR.xv b/test/imgproc/lenna367IIR.xv
deleted file mode 100644
index ab4b98266..000000000
Binary files a/test/imgproc/lenna367IIR.xv and /dev/null differ
diff --git a/test/imgproc/lenna42.xv b/test/imgproc/lenna42.xv
deleted file mode 100644
index ef17ec8ce..000000000
Binary files a/test/imgproc/lenna42.xv and /dev/null differ
diff --git a/test/imgproc/lenna42FIR.xv b/test/imgproc/lenna42FIR.xv
deleted file mode 100644
index 3929649e0..000000000
Binary files a/test/imgproc/lenna42FIR.xv and /dev/null differ
diff --git a/test/imgproc/lenna42IIR.xv b/test/imgproc/lenna42IIR.xv
deleted file mode 100644
index 4cfd069af..000000000
Binary files a/test/imgproc/lenna42IIR.xv and /dev/null differ
diff --git a/test/imgproc/lenna42lin.xv b/test/imgproc/lenna42lin.xv
deleted file mode 100644
index cfefba5a4..000000000
Binary files a/test/imgproc/lenna42lin.xv and /dev/null differ
diff --git a/test/imgproc/lenna42linrgb.xv b/test/imgproc/lenna42linrgb.xv
deleted file mode 100644
index 59fe8896b..000000000
Binary files a/test/imgproc/lenna42linrgb.xv and /dev/null differ
diff --git a/test/imgproc/lenna42neu.xv b/test/imgproc/lenna42neu.xv
deleted file mode 100644
index 4cfd069af..000000000
Binary files a/test/imgproc/lenna42neu.xv and /dev/null differ
diff --git a/test/imgproc/lenna42rgb.xv b/test/imgproc/lenna42rgb.xv
deleted file mode 100644
index 18c6f566b..000000000
Binary files a/test/imgproc/lenna42rgb.xv and /dev/null differ
diff --git a/test/imgproc/lenna42rgbneu.xv b/test/imgproc/lenna42rgbneu.xv
deleted file mode 100644
index 7f9709055..000000000
Binary files a/test/imgproc/lenna42rgbneu.xv and /dev/null differ
diff --git a/test/imgproc/lenna_rotate.xv b/test/imgproc/lenna_rotate.xv
deleted file mode 100644
index c4a55033a..000000000
Binary files a/test/imgproc/lenna_rotate.xv and /dev/null differ
diff --git a/test/imgproc/lennargb42FIR.xv b/test/imgproc/lennargb42FIR.xv
deleted file mode 100644
index b4551ed48..000000000
Binary files a/test/imgproc/lennargb42FIR.xv and /dev/null differ
diff --git a/test/imgproc/lennargb42IIR.xv b/test/imgproc/lennargb42IIR.xv
deleted file mode 100644
index 7f9709055..000000000
Binary files a/test/imgproc/lennargb42IIR.xv and /dev/null differ
diff --git a/test/imgproc/splineimageview2.xv b/test/imgproc/splineimageview2.xv
index f76327bc4..0b7c68baf 100644
Binary files a/test/imgproc/splineimageview2.xv and b/test/imgproc/splineimageview2.xv differ
diff --git a/test/imgproc/splineimageview3.xv b/test/imgproc/splineimageview3.xv
index 3c82c1d60..d98609a4b 100644
Binary files a/test/imgproc/splineimageview3.xv and b/test/imgproc/splineimageview3.xv differ
diff --git a/test/imgproc/splineimageview5.xv b/test/imgproc/splineimageview5.xv
index 4769965e9..efd49359c 100644
Binary files a/test/imgproc/splineimageview5.xv and b/test/imgproc/splineimageview5.xv differ
diff --git a/test/imgproc/test.cxx b/test/imgproc/test.cxx
index fd0fe46f1..929ce5a3d 100644
--- a/test/imgproc/test.cxx
+++ b/test/imgproc/test.cxx
@@ -1126,11 +1126,11 @@ struct ResizeImageTest
 
     ResizeImageTest()
     {
-        ImageImportInfo ginfo("lenna128.xv");
+        ImageImportInfo ginfo("astronaut128.xv");
         img.resize(ginfo.width(), ginfo.height());
         importImage(ginfo, destImage(img));
 
-        ImageImportInfo cinfo("lenna128rgb.xv");
+        ImageImportInfo cinfo("astronaut128rgb.xv");
         rgb.resize(cinfo.width(), cinfo.height());
         importImage(cinfo, destImage(rgb));
 
@@ -1138,7 +1138,7 @@ struct ResizeImageTest
 
     void resizeLinearInterpolationReduceTest()
     {
-        ImageImportInfo inforef("lenna42lin.xv");
+        ImageImportInfo inforef("astronaut42lin.xv");
         Image ref(inforef.size());
         importImage(inforef, destImage(ref));
 
@@ -1148,7 +1148,7 @@ struct ResizeImageTest
 
         shouldEqualSequenceTolerance(dest.begin(), dest.end(), ref.begin(), 1.0e-6f);
 
-        ImageImportInfo inforgb("lenna42linrgb.xv");
+        ImageImportInfo inforgb("astronaut42linrgb.xv");
         RGBImage rgbref(inforgb.size());
         importImage(inforgb, destImage(rgbref));
 
@@ -1162,7 +1162,7 @@ struct ResizeImageTest
 
     void scalarExpand()
     {
-        ImageImportInfo info("lenna288neu.xv");
+        ImageImportInfo info("astronaut288neu.xv");
 
         Image imgex(info.width(), info.height());
         importImage(info, destImage(imgex));
@@ -1175,7 +1175,7 @@ struct ResizeImageTest
 
     void scalarReduce()
     {
-        ImageImportInfo info("lenna42neu.xv");
+        ImageImportInfo info("astronaut42neu.xv");
 
         Image imgred(info.width(), info.height());
         importImage(info, destImage(imgred));
@@ -1189,7 +1189,7 @@ struct ResizeImageTest
 
     void rgbExpand()
     {
-        ImageImportInfo info("lenna288rgbneu.xv");
+        ImageImportInfo info("astronaut288rgbneu.xv");
 
         RGBImage rgbex(info.width(), info.height());
         importImage(info, destImage(rgbex));
@@ -1212,7 +1212,7 @@ struct ResizeImageTest
 
     void rgbReduce()
     {
-        ImageImportInfo info("lenna42rgbneu.xv");
+        ImageImportInfo info("astronaut42rgbneu.xv");
 
         RGBImage rgbred(info.width(), info.height());
         importImage(info, destImage(rgbred));
@@ -1235,9 +1235,9 @@ struct ResizeImageTest
 
     /*Vergroesserungstest
     */
-    void testCatmullRomInterpolationExtensionWithLena()
+    void testCatmullRomInterpolationExtensionWithAstronaut()
     {
-        ImageImportInfo inforef("lenna367FIR.xv");
+        ImageImportInfo inforef("astronaut367FIR.xv");
         Image ref(inforef.size());
         importImage(inforef, destImage(ref));
 
@@ -1251,9 +1251,9 @@ struct ResizeImageTest
 
     /*Verkleinerungstest
     */
-    void testCatmullRomInterpolationReductionWithLena()
+    void testCatmullRomInterpolationReductionWithAstronaut()
     {
-        ImageImportInfo inforef("lenna42FIR.xv");
+        ImageImportInfo inforef("astronaut42FIR.xv");
         Image ref(inforef.size());
         importImage(inforef, destImage(ref));
 
@@ -1263,7 +1263,7 @@ struct ResizeImageTest
 
         shouldEqualSequenceTolerance(dest.begin(), dest.end(), ref.begin(), 1e-4f);
 
-        ImageImportInfo inforgb("lennargb42FIR.xv");
+        ImageImportInfo inforgb("astronautrgb42FIR.xv");
         RGBImage rgbref(inforgb.size());
         importImage(inforgb, destImage(rgbref));
 
@@ -1283,9 +1283,9 @@ struct ResizeImageTest
         }
     }
 
-    void testCubicInterpolationExtensionWithLena()
+    void testCubicInterpolationExtensionWithAstronaut()
     {
-        ImageImportInfo inforef("lenna367IIR.xv");
+        ImageImportInfo inforef("astronaut367IIR.xv");
         Image ref(inforef.size());
         importImage(inforef, destImage(ref));
 
@@ -1298,9 +1298,9 @@ struct ResizeImageTest
 
     /*Verkleinerungstest
     */
-    void testCubicInterpolationReductionWithLena()
+    void testCubicInterpolationReductionWithAstronaut()
     {
-        ImageImportInfo inforef("lenna42IIR.xv");
+        ImageImportInfo inforef("astronaut42IIR.xv");
         Image ref(inforef.size());
         importImage(inforef, destImage(ref));
 
@@ -1310,7 +1310,7 @@ struct ResizeImageTest
 
         shouldEqualSequenceTolerance(dest.begin(), dest.end(), ref.begin(), 1e-4f);
 
-        ImageImportInfo inforgb("lennargb42IIR.xv");
+        ImageImportInfo inforgb("astronautrgb42IIR.xv");
         RGBImage rgbref(inforgb.size());
         importImage(inforgb, destImage(rgbref));
 
@@ -1370,10 +1370,10 @@ struct SplineImageViewTest
 
     SplineImageViewTest()
     {
-        ImageImportInfo ginfo("lenna128.xv");
+        ImageImportInfo ginfo("astronaut128.xv");
         img.resize(ginfo.width(), ginfo.height());
         importImage(ginfo, destImage(img));
-        //importImage("lenna128.xv", img);
+        // importImage("astronaut128.xv", img);
     }
 
     void testPSF()
@@ -1592,7 +1592,7 @@ struct GeometricTransformsTest
 
     GeometricTransformsTest()
     {
-        ImageImportInfo ginfo("lenna128.xv");
+        ImageImportInfo ginfo("astronaut128.xv");
         w = ginfo.width();
         h = ginfo.height();
         img.resize(w, h);
@@ -1719,7 +1719,7 @@ struct GeometricTransformsTest
     void testRotation()
     {
         Image res(img.size()), ref(img.size()), res1(img.size());
-        importImage(vigra::ImageImportInfo("lenna_rotate.xv"), destImage(ref));
+        importImage(vigra::ImageImportInfo("astronaut_rotate.xv"), destImage(ref));
 
         SplineImageView<3, double> sp(srcImageRange(img));
 
@@ -1794,10 +1794,10 @@ struct ImageFunctionsTestSuite
         add( testCase( &ResizeImageTest::scalarReduce));
         add( testCase( &ResizeImageTest::rgbExpand));
         add( testCase( &ResizeImageTest::rgbReduce));
-        add( testCase( &ResizeImageTest::testCatmullRomInterpolationExtensionWithLena));
-        add( testCase( &ResizeImageTest::testCatmullRomInterpolationReductionWithLena));
-        add( testCase( &ResizeImageTest::testCubicInterpolationExtensionWithLena));
-        add( testCase( &ResizeImageTest::testCubicInterpolationReductionWithLena));
+        add( testCase( &ResizeImageTest::testCatmullRomInterpolationExtensionWithAstronaut));
+        add( testCase( &ResizeImageTest::testCatmullRomInterpolationReductionWithAstronaut));
+        add( testCase( &ResizeImageTest::testCubicInterpolationExtensionWithAstronaut));
+        add( testCase( &ResizeImageTest::testCubicInterpolationReductionWithAstronaut));
         add( testCase( &ResizeImageTest::testCatmullRomInterpolationExtensionHandControled));
         add( testCase( &SplineImageViewTest<0>::testPSF));
         add( testCase( &SplineImageViewTest<0>::testCoefficientArray));
diff --git a/test/impex/CMakeLists.txt b/test/impex/CMakeLists.txt
index fca448ed5..47fe8cebc 100644
--- a/test/impex/CMakeLists.txt
+++ b/test/impex/CMakeLists.txt
@@ -17,5 +17,5 @@ ENDIF(OPENEXR_FOUND)
 
 VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex)
 
-VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif  lenna_masked_gray.tif bilevel.tiff)
+VIGRA_COPY_TEST_DATA(astronaut.xv astronaut_gifref.xv astronautfloat.xv astronautfloatrgb.xv astronautrgb.xv no-image.txt astronaut_0.tif astronaut_1.tif astronaut_2.tif astronaut_masked_color.tif  astronaut_masked_gray.tif bilevel.tiff)
 
diff --git a/test/impex/astronaut.xv b/test/impex/astronaut.xv
new file mode 100644
index 000000000..f7b5b9561
Binary files /dev/null and b/test/impex/astronaut.xv differ
diff --git a/test/impex/astronaut_0.tif b/test/impex/astronaut_0.tif
new file mode 100644
index 000000000..43a7f29bf
Binary files /dev/null and b/test/impex/astronaut_0.tif differ
diff --git a/test/impex/astronaut_1.tif b/test/impex/astronaut_1.tif
new file mode 100644
index 000000000..8e21bb3c8
Binary files /dev/null and b/test/impex/astronaut_1.tif differ
diff --git a/test/impex/astronaut_2.tif b/test/impex/astronaut_2.tif
new file mode 100644
index 000000000..ebbc3d74f
Binary files /dev/null and b/test/impex/astronaut_2.tif differ
diff --git a/test/impex/astronaut_gifref.xv b/test/impex/astronaut_gifref.xv
new file mode 100644
index 000000000..39b326ec7
Binary files /dev/null and b/test/impex/astronaut_gifref.xv differ
diff --git a/test/impex/astronaut_masked_color.tif b/test/impex/astronaut_masked_color.tif
new file mode 100644
index 000000000..6267268d8
Binary files /dev/null and b/test/impex/astronaut_masked_color.tif differ
diff --git a/test/impex/astronaut_masked_gray.tif b/test/impex/astronaut_masked_gray.tif
new file mode 100644
index 000000000..ad8e03f35
Binary files /dev/null and b/test/impex/astronaut_masked_gray.tif differ
diff --git a/test/impex/astronautfloat.xv b/test/impex/astronautfloat.xv
new file mode 100644
index 000000000..4fa7681e7
Binary files /dev/null and b/test/impex/astronautfloat.xv differ
diff --git a/test/impex/astronautfloatrgb.xv b/test/impex/astronautfloatrgb.xv
new file mode 100644
index 000000000..9bd1c817e
Binary files /dev/null and b/test/impex/astronautfloatrgb.xv differ
diff --git a/test/impex/astronautrgb.xv b/test/impex/astronautrgb.xv
new file mode 100644
index 000000000..e1103c6bd
Binary files /dev/null and b/test/impex/astronautrgb.xv differ
diff --git a/test/impex/lenna.xv b/test/impex/lenna.xv
deleted file mode 100644
index e2d5d3783..000000000
Binary files a/test/impex/lenna.xv and /dev/null differ
diff --git a/test/impex/lenna_0.tif b/test/impex/lenna_0.tif
deleted file mode 100644
index dccd7ae71..000000000
Binary files a/test/impex/lenna_0.tif and /dev/null differ
diff --git a/test/impex/lenna_1.tif b/test/impex/lenna_1.tif
deleted file mode 100644
index c7c8e553f..000000000
Binary files a/test/impex/lenna_1.tif and /dev/null differ
diff --git a/test/impex/lenna_2.tif b/test/impex/lenna_2.tif
deleted file mode 100644
index 24fd6f79a..000000000
Binary files a/test/impex/lenna_2.tif and /dev/null differ
diff --git a/test/impex/lenna_gifref.xv b/test/impex/lenna_gifref.xv
deleted file mode 100644
index 18e087d22..000000000
Binary files a/test/impex/lenna_gifref.xv and /dev/null differ
diff --git a/test/impex/lenna_masked_color.tif b/test/impex/lenna_masked_color.tif
deleted file mode 100644
index a5c01939f..000000000
Binary files a/test/impex/lenna_masked_color.tif and /dev/null differ
diff --git a/test/impex/lenna_masked_gray.tif b/test/impex/lenna_masked_gray.tif
deleted file mode 100644
index 0d6730758..000000000
Binary files a/test/impex/lenna_masked_gray.tif and /dev/null differ
diff --git a/test/impex/lennafloat.xv b/test/impex/lennafloat.xv
deleted file mode 100644
index e6bd2c872..000000000
Binary files a/test/impex/lennafloat.xv and /dev/null differ
diff --git a/test/impex/lennafloatrgb.xv b/test/impex/lennafloatrgb.xv
deleted file mode 100644
index 0542e8f72..000000000
Binary files a/test/impex/lennafloatrgb.xv and /dev/null differ
diff --git a/test/impex/lennargb.xv b/test/impex/lennargb.xv
deleted file mode 100644
index 03ec3f49b..000000000
Binary files a/test/impex/lennargb.xv and /dev/null differ
diff --git a/test/impex/test.cxx b/test/impex/test.cxx
index 7d5af7668..8ab92bf50 100644
--- a/test/impex/test.cxx
+++ b/test/impex/test.cxx
@@ -73,7 +73,7 @@ class ByteImageExportImportTest
 
     ByteImageExportImportTest ()
     {
-        vigra::ImageImportInfo info ("lenna.xv");
+        vigra::ImageImportInfo info ("astronaut.xv");
 
         const int w = info.width ();
         const int h = info.height ();
@@ -128,7 +128,7 @@ class ByteImageExportImportTest
 
     void testIsImage()
     {
-        should(isImage("lenna.xv"));
+        should(isImage("astronaut.xv"));
         should(!isImage("no-image.txt"));
         should(!isImage("filename-does-not-exist.gif"));
     }
@@ -169,7 +169,7 @@ class ByteImageExportImportTest
     {
         MultiArray<2, RGBValue<unsigned char> > rgb;
 
-        importImage("lenna.xv", rgb);
+        importImage("astronaut.xv", rgb);
 
         should (rgb.shape(0) == img.width());
         should (rgb.shape(1) == img.height());
@@ -272,7 +272,7 @@ class ByteImageExportImportTest
 #if defined(HasTIFF)
         for (int i=0; i < 3; ++i)
         {
-            std::string fileName = std::string("lenna_") + vigra::asString(i) + ".tif";
+            std::string fileName = std::string("astronaut_") + vigra::asString(i) + ".tif";
             vigra::ImageImportInfo ininfo (fileName.c_str());
             Image inimg(ininfo.width(), ininfo.height());
             importImage(ininfo, destImage(inimg));
@@ -284,7 +284,7 @@ class ByteImageExportImportTest
         {
             vigra::ImageImportInfo ininfo ("resseq.tif", j);
             Image inimg(ininfo.width(), ininfo.height());
-            std::string fileName = std::string("lenna_") + vigra::asString(j) + ".tif";
+            std::string fileName = std::string("astronaut_") + vigra::asString(j) + ".tif";
             importImage(ininfo, destImage(inimg));
             vigra::ImageImportInfo originfo (fileName.c_str());
             Image origimg(originfo.width(), originfo.height());
@@ -419,7 +419,7 @@ class ByteRGBImageExportImportTest
 public:
     ByteRGBImageExportImportTest ()
     {
-        vigra::ImageImportInfo info ("lennargb.xv");
+        vigra::ImageImportInfo info ("astronautrgb.xv");
 
         int w = info.width ();
         int h = info.height ();
@@ -446,7 +446,7 @@ class ByteRGBImageExportImportTest
         Image ref (info.width (), info.height ());
 
         importImage (info, destImage (res));
-        importImage (vigra::ImageImportInfo("lenna_gifref.xv"), destImage (ref));
+        importImage (vigra::ImageImportInfo("astronaut_gifref.xv"), destImage (ref));
 
         Image::ScanOrderIterator i = ref.begin ();
         Image::ScanOrderIterator i1 = res.begin ();
@@ -776,7 +776,7 @@ class FloatImageExportImportTest
     FloatImageExportImportTest ()
     : rereadType("DOUBLE")
     {
-        vigra::ImageImportInfo info ("lenna.xv");
+        vigra::ImageImportInfo info ("astronaut.xv");
 
         int w = info.width ();
         int h = info.height ();
@@ -785,7 +785,7 @@ class FloatImageExportImportTest
 
         importImage (info, destImage (img));
 
-        vigra::ImageImportInfo rinfo ("lennafloat.xv");
+        vigra::ImageImportInfo rinfo ("astronautfloat.xv");
 
         reread.resize (w, h);
 
@@ -1017,7 +1017,7 @@ class FloatRGBImageExportImportTest
 
     FloatRGBImageExportImportTest ()
     {
-        vigra::ImageImportInfo info ("lennargb.xv");
+        vigra::ImageImportInfo info ("astronautrgb.xv");
 
         int w = info.width ();
         int h = info.height ();
@@ -1026,7 +1026,7 @@ class FloatRGBImageExportImportTest
 
         importImage (info, destImage (img));
 
-        vigra::ImageImportInfo rinfo ("lennafloatrgb.xv");
+        vigra::ImageImportInfo rinfo ("astronautfloatrgb.xv");
 
         reread.resize (w, h);
 
@@ -1591,7 +1591,7 @@ class ImageExportImportFailureTest
         MultiArray<2, RGBValue<UInt8> > rgb(1,1);
 
         try {
-            importImage(ImageImportInfo("lennargb.xv"), rgb);
+            importImage(ImageImportInfo("astronautrgb.xv"), rgb);
             failTest( "Failed to throw exception." );
         }
         catch( vigra::PreconditionViolation & e ) {
@@ -1603,7 +1603,7 @@ class ImageExportImportFailureTest
         MultiArray<2, TinyVector<UInt8, 4> > vec4;
 
         try {
-            importImage("lennargb.xv", vec4);
+            importImage("astronautrgb.xv", vec4);
             failTest( "Failed to throw exception." );
         }
         catch( vigra::PreconditionViolation & e ) {
@@ -1620,7 +1620,7 @@ class GrayscaleImportExportAlphaTest
     GrayscaleImportExportAlphaTest()
     {
 #if defined(HasTIFF)
-        vigra::ImageImportInfo info("lenna_masked_gray.tif");
+        vigra::ImageImportInfo info("astronaut_masked_gray.tif");
 
         image_.resize(info.size());
         alpha_.resize(info.size());
@@ -1733,7 +1733,7 @@ class RGBImportExportAlphaTest
     RGBImportExportAlphaTest()
     {
 #if defined(HasTIFF)
-        vigra::ImageImportInfo info("lenna_masked_color.tif");
+        vigra::ImageImportInfo info("astronaut_masked_color.tif");
 
         image_.resize(info.size());
         alpha_.resize(info.size());
diff --git a/test/simpleanalysis/CMakeLists.txt b/test/simpleanalysis/CMakeLists.txt
index d879df1c0..41dea0c38 100644
--- a/test/simpleanalysis/CMakeLists.txt
+++ b/test/simpleanalysis/CMakeLists.txt
@@ -7,4 +7,4 @@ else()
     VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex)
 endif()
 
-VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv lenna128.xv)
+VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv astronaut128.xv)
diff --git a/test/simpleanalysis/astronaut128.xv b/test/simpleanalysis/astronaut128.xv
new file mode 100644
index 000000000..3c398cddd
Binary files /dev/null and b/test/simpleanalysis/astronaut128.xv differ
diff --git a/test/simpleanalysis/lenna128.xv b/test/simpleanalysis/lenna128.xv
deleted file mode 100644
index 11782b2b6..000000000
Binary files a/test/simpleanalysis/lenna128.xv and /dev/null differ
diff --git a/test/simpleanalysis/test.cxx b/test/simpleanalysis/test.cxx
index 3e092e759..f2eb5c3e1 100644
--- a/test/simpleanalysis/test.cxx
+++ b/test/simpleanalysis/test.cxx
@@ -2332,7 +2332,7 @@ struct AffineRegistrationTest
 
     AffineRegistrationTest()
     {
-        ImageImportInfo info("lenna128.xv");
+        ImageImportInfo info("astronaut128.xv");
         image.resize(info.size());
         importImage(info, destImage(image));
     }
diff --git a/test/slic2d/CMakeLists.txt b/test/slic2d/CMakeLists.txt
index 9725f9347..a9d2449c9 100644
--- a/test/slic2d/CMakeLists.txt
+++ b/test/slic2d/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-VIGRA_COPY_TEST_DATA(lenna.xv slic.xv)
+VIGRA_COPY_TEST_DATA(astronaut.xv slic.xv)
 VIGRA_ADD_TEST(test_slic2d test.cxx LIBRARIES vigraimpex)
\ No newline at end of file
diff --git a/test/slic2d/astronaut.xv b/test/slic2d/astronaut.xv
new file mode 100644
index 000000000..43d67bf7c
Binary files /dev/null and b/test/slic2d/astronaut.xv differ
diff --git a/test/slic2d/lenna.xv b/test/slic2d/lenna.xv
deleted file mode 100644
index 03ec3f49b..000000000
Binary files a/test/slic2d/lenna.xv and /dev/null differ
diff --git a/test/slic2d/slic.xv b/test/slic2d/slic.xv
index 8128044ee..1c5d3d9ad 100644
Binary files a/test/slic2d/slic.xv and b/test/slic2d/slic.xv differ
diff --git a/test/slic2d/test.cxx b/test/slic2d/test.cxx
index d3ae2678a..e8fd7970b 100644
--- a/test/slic2d/test.cxx
+++ b/test/slic2d/test.cxx
@@ -59,35 +59,35 @@ struct SlicTest
     typedef typename MultiArrayShape<N>::type     Shape;
 
     ImageImportInfo info;
-    FRGBArray lennaImage;
+    FRGBArray astronautImage;
 
     SlicTest()
-    :   info("lenna.xv"),
-        lennaImage(info.shape())
+    :   info("astronaut.xv"),
+        astronautImage(info.shape())
     {
-        importImage(info, destImage(lennaImage));
-        transformMultiArray(srcMultiArrayRange(lennaImage), destMultiArray(lennaImage), RGBPrime2LabFunctor<float>());
+        importImage(info, destImage(astronautImage));
+        transformMultiArray(srcMultiArrayRange(astronautImage), destMultiArray(astronautImage), RGBPrime2LabFunctor<float>());
     }
 
     void test_seeding()
     {
         Shape seeds_ref[] = {
-               Shape(24, 22),
+               Shape(26, 22),
                Shape(65, 22),
-               Shape(102, 20),
-               Shape(24, 59),
-               Shape(63, 60),
+               Shape(103, 20),
+               Shape(26, 59),
+               Shape(65, 59),
                Shape(104, 61),
-               Shape(24, 100),
+               Shape(26, 98),
                Shape(65, 100),
-               Shape(104, 100)
+               Shape(102, 99)
         };
 
         // get grad mag image
-        FArray gradMag(lennaImage.shape());
-        gaussianGradientMagnitude(lennaImage, gradMag, 3.0);
+        FArray gradMag(astronautImage.shape());
+        gaussianGradientMagnitude(astronautImage, gradMag, 3.0);
 
-        IArray labels(lennaImage.shape());
+        IArray labels(astronautImage.shape());
         int maxSeedlabel = generateSlicSeeds(gradMag, labels, 39, 1);
         shouldEqual(maxSeedlabel, 9);
 
@@ -107,15 +107,15 @@ struct SlicTest
 
     void test_slic()
     {
-        IArray labels(lennaImage.shape()), labels_ref(lennaImage.shape());
+        IArray labels(astronautImage.shape()), labels_ref(astronautImage.shape());
 
-        int seedDistance = 8;
+        int seedDistance = 9;
         // compute seeds automatically
-        int maxlabel = slicSuperpixels(lennaImage, labels, 20.0, seedDistance, SlicOptions().minSize(0).iterations(40));
+        int maxlabel = slicSuperpixels(astronautImage, labels, 20.0, seedDistance, SlicOptions().minSize(0).iterations(40));
 
-        shouldEqual(maxlabel, 245);
+        shouldEqual(maxlabel, 201);
 
-        // exportImage(srcImageRange(labels), ImageExportInfo("slic.xv"));
+        // exportImage(srcImageRange(labels), ImageExportInfo("slic.xv").setForcedRangeMapping(0.0, 1.0, 0.0, 1.0));
         importImage(ImageImportInfo("slic.xv"), destImage(labels_ref));
 
         should(labels == labels_ref);