diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp
index 27126829760b..b7f2be8b2cdd 100644
--- a/tests/src/core/testqgscoordinatetransform.cpp
+++ b/tests/src/core/testqgscoordinatetransform.cpp
@@ -61,6 +61,12 @@ void TestQgsCoordinateTransform::transformBoundingBox()
   expectedRect.setYMinimum( -39.7222 );
   expectedRect.setXMaximum( -176.549 );
   expectedRect.setYMaximum( -36.3951 );
+
+  qDebug( "BBox transform x min: %.17f", resultRect.xMinimum() );
+  qDebug( "BBox transform x max: %.17f", resultRect.xMaximum() );
+  qDebug( "BBox transform y min: %.17f", resultRect.yMinimum() );
+  qDebug( "BBox transform y max: %.17f", resultRect.yMaximum() );
+
   QVERIFY( qgsDoubleNear( resultRect.xMinimum(), expectedRect.xMinimum(), 0.001 ) );
   QVERIFY( qgsDoubleNear( resultRect.yMinimum(), expectedRect.yMinimum(), 0.001 ) );
   QVERIFY( qgsDoubleNear( resultRect.xMaximum(), expectedRect.xMaximum(), 0.001 ) );
@@ -69,3 +75,4 @@ void TestQgsCoordinateTransform::transformBoundingBox()
 
 QTEST_MAIN( TestQgsCoordinateTransform )
 #include "testqgscoordinatetransform.moc"
+
diff --git a/tests/src/core/testqgsmaptopixel.cpp b/tests/src/core/testqgsmaptopixel.cpp
index 97d8694ba492..dae059843079 100644
--- a/tests/src/core/testqgsmaptopixel.cpp
+++ b/tests/src/core/testqgsmaptopixel.cpp
@@ -50,7 +50,8 @@ void TestQgsMapToPixel::legacy()
   QCOMPARE( p.x(), -10.2 );
   QCOMPARE( p.y(), 11.2 );
   d = m2p.transform( p );
-  QCOMPARE( d, QgsPoint( -1, -1 ) );
+  QCOMPARE( d.x(), -1.0 );
+  QCOMPARE( d.y(), -1.0 );
 
   p = m2p.toMapCoordinates( 20, 20 );
   QCOMPARE( p.x(), -6.0 );
diff --git a/tests/testdata/control_images/expected_composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation_mask.png b/tests/testdata/control_images/expected_composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation_mask.png
new file mode 100644
index 000000000000..b36388b1724b
Binary files /dev/null and b/tests/testdata/control_images/expected_composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation_mask.png differ
diff --git a/tests/testdata/control_images/expected_landsat_875/expected_landsat_875_mask.png b/tests/testdata/control_images/expected_landsat_875/expected_landsat_875_mask.png
new file mode 100644
index 000000000000..22fc1a396fd9
Binary files /dev/null and b/tests/testdata/control_images/expected_landsat_875/expected_landsat_875_mask.png differ
diff --git a/tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png b/tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png
deleted file mode 100644
index 679b226354b6..000000000000
Binary files a/tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png and /dev/null differ
diff --git a/tests/testdata/control_images/expected_landsat_basic/expected_landsat_basic_mask.png b/tests/testdata/control_images/expected_landsat_basic/expected_landsat_basic_mask.png
new file mode 100644
index 000000000000..2d88e88327cb
Binary files /dev/null and b/tests/testdata/control_images/expected_landsat_basic/expected_landsat_basic_mask.png differ
diff --git a/tests/testdata/control_images/expected_raster_colorRamp1/expected_raster_colorRamp1_mask.png b/tests/testdata/control_images/expected_raster_colorRamp1/expected_raster_colorRamp1_mask.png
new file mode 100644
index 000000000000..e0102343d07b
Binary files /dev/null and b/tests/testdata/control_images/expected_raster_colorRamp1/expected_raster_colorRamp1_mask.png differ
diff --git a/tests/testdata/control_images/expected_raster_colorRamp1/stingray_colorRamp1_anomaly.png b/tests/testdata/control_images/expected_raster_colorRamp1/stingray_colorRamp1_anomaly.png
deleted file mode 100644
index 659d3c679409..000000000000
Binary files a/tests/testdata/control_images/expected_raster_colorRamp1/stingray_colorRamp1_anomaly.png and /dev/null differ
diff --git a/tests/testdata/control_images/expected_raster_pseudo/expected_raster_pseudo_mask.png b/tests/testdata/control_images/expected_raster_pseudo/expected_raster_pseudo_mask.png
new file mode 100644
index 000000000000..439d8ecbc1e7
Binary files /dev/null and b/tests/testdata/control_images/expected_raster_pseudo/expected_raster_pseudo_mask.png differ
diff --git a/tests/testdata/control_images/expected_raster_pseudo/stingray_pseudo_anomaly.png b/tests/testdata/control_images/expected_raster_pseudo/stingray_pseudo_anomaly.png
deleted file mode 100644
index ddfa03dff83e..000000000000
Binary files a/tests/testdata/control_images/expected_raster_pseudo/stingray_pseudo_anomaly.png and /dev/null differ
diff --git a/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency.png.aux.xml b/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency.png.aux.xml
deleted file mode 100644
index aa52ab148b33..000000000000
--- a/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency.png.aux.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<PAMDataset>
-  <Metadata domain="IMAGE_STRUCTURE">
-    <MDI key="INTERLEAVE">PIXEL</MDI>
-  </Metadata>
-  <PAMRasterBand band="1">
-    <Metadata>
-      <MDI key="STATISTICS_MAXIMUM">255</MDI>
-      <MDI key="STATISTICS_MEAN">144.08</MDI>
-      <MDI key="STATISTICS_MINIMUM">0</MDI>
-      <MDI key="STATISTICS_STDDEV">62.006238395826</MDI>
-    </Metadata>
-  </PAMRasterBand>
-  <PAMRasterBand band="2">
-    <Metadata>
-      <MDI key="STATISTICS_MAXIMUM">255</MDI>
-      <MDI key="STATISTICS_MEAN">165.72</MDI>
-      <MDI key="STATISTICS_MINIMUM">0</MDI>
-      <MDI key="STATISTICS_STDDEV">67.364394155963</MDI>
-    </Metadata>
-  </PAMRasterBand>
-  <PAMRasterBand band="3">
-    <Metadata>
-      <MDI key="STATISTICS_MAXIMUM">255</MDI>
-      <MDI key="STATISTICS_MEAN">175.38</MDI>
-      <MDI key="STATISTICS_MINIMUM">0</MDI>
-      <MDI key="STATISTICS_STDDEV">73.064872544883</MDI>
-    </Metadata>
-  </PAMRasterBand>
-</PAMDataset>
diff --git a/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency_mask.png b/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency_mask.png
new file mode 100644
index 000000000000..b146f9d644fd
Binary files /dev/null and b/tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency_mask.png differ
diff --git a/tests/testdata/control_images/expected_raster_transparency/stingray_transparency_python_anomaly.png b/tests/testdata/control_images/expected_raster_transparency/stingray_transparency_python_anomaly.png
deleted file mode 100644
index ca719ddfee24..000000000000
Binary files a/tests/testdata/control_images/expected_raster_transparency/stingray_transparency_python_anomaly.png and /dev/null differ
diff --git a/tests/testdata/control_images/expected_raster_transparency/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_raster_transparency/ubuntu_13.04.anomaly.png
deleted file mode 100644
index ba7542691559..000000000000
Binary files a/tests/testdata/control_images/expected_raster_transparency/ubuntu_13.04.anomaly.png and /dev/null differ