diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
index f4367a538..9d6aaf9fc 100644
--- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
@@ -1744,7 +1744,7 @@ void AbstractImageConverterTest::convertImageData2DToData() {
 
     /* Should get "C" when converting compressed */
     {
-        Containers::Optional<Containers::Array<char>> out = converter.convertToData(ImageData2D{CompressedPixelFormat::Bc1RGBUnorm, {4, 4}, Containers::Array<char>{4}});
+        Containers::Optional<Containers::Array<char>> out = converter.convertToData(ImageData2D{CompressedPixelFormat::Bc1RGBUnorm, {4, 4}, Containers::Array<char>{NoInit, 8}});
         CORRADE_VERIFY(out);
         CORRADE_COMPARE_AS(*out,
             Containers::arrayView({'C'}),
@@ -1766,7 +1766,7 @@ void AbstractImageConverterTest::convertImageData3DToData() {
 
     /* Should get "C" when converting compressed */
     {
-        Containers::Optional<Containers::Array<char>> out = converter.convertToData(ImageData3D{CompressedPixelFormat::Bc1RGBUnorm, {4, 4, 1}, Containers::Array<char>{4}});
+        Containers::Optional<Containers::Array<char>> out = converter.convertToData(ImageData3D{CompressedPixelFormat::Bc1RGBUnorm, {4, 4, 1}, Containers::Array<char>{NoInit, 8}});
         CORRADE_VERIFY(out);
         CORRADE_COMPARE_AS(*out,
             Containers::arrayView({'C'}),
@@ -3048,7 +3048,7 @@ void AbstractImageConverterTest::convertCompressed2DToFile() {
     if(Utility::Path::exists(filename))
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{NoInit, 128}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d", TestSuite::Compare::FileToString);
 }
@@ -3067,7 +3067,7 @@ void AbstractImageConverterTest::convertCompressed3DToFile() {
     if(Utility::Path::exists(filename))
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array<char>{NoInit, 256}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d\x02", TestSuite::Compare::FileToString);
 }
@@ -3164,7 +3164,7 @@ void AbstractImageConverterTest::convertCompressed2DToFileThroughData() {
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
     /* doConvertToFile() should call doConvertToData() */
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{NoInit, 128}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d", TestSuite::Compare::FileToString);
 }
@@ -3184,7 +3184,7 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughData() {
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
     /* doConvertToFile() should call doConvertToData() */
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x02}, Containers::Array<char>{NoInit, 256}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d\x02", TestSuite::Compare::FileToString);
 }
@@ -3408,7 +3408,7 @@ void AbstractImageConverterTest::convertImageData1DToFile() {
         "B", TestSuite::Compare::FileToString);
 
     /* Should get "C" when converting compressed */
-    CORRADE_VERIFY(converter.convertToFile(ImageData1D{CompressedPixelFormat::Bc2RGBAUnorm, 4, Containers::Array<char>{8}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
+    CORRADE_VERIFY(converter.convertToFile(ImageData1D{CompressedPixelFormat::Bc2RGBAUnorm, 4, Containers::Array<char>{NoInit, 16}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
     CORRADE_COMPARE_AS(Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out"),
         "C", TestSuite::Compare::FileToString);
 }
@@ -3422,7 +3422,7 @@ void AbstractImageConverterTest::convertImageData2DToFile() {
         "B", TestSuite::Compare::FileToString);
 
     /* Should get "C" when converting compressed */
-    CORRADE_VERIFY(converter.convertToFile(ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{8}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
+    CORRADE_VERIFY(converter.convertToFile(ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{NoInit, 16}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
     CORRADE_COMPARE_AS(Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out"),
         "C", TestSuite::Compare::FileToString);
 }
@@ -3436,7 +3436,7 @@ void AbstractImageConverterTest::convertImageData3DToFile() {
         "B", TestSuite::Compare::FileToString);
 
     /* Should get "C" when converting compressed */
-    CORRADE_VERIFY(converter.convertToFile(ImageData3D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4, 1}, Containers::Array<char>{4}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
+    CORRADE_VERIFY(converter.convertToFile(ImageData3D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4, 1}, Containers::Array<char>{NoInit, 16}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out")));
     CORRADE_COMPARE_AS(Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out"),
         "C", TestSuite::Compare::FileToString);
 }
@@ -3957,7 +3957,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFile() {
 
     const char data[8]{};
     CORRADE_VERIFY(converter.convertToFile({
-        CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{64}},
+        CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{NoInit, 128}},
         CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4}, data}
     }, filename));
     CORRADE_COMPARE_AS(filename,
@@ -3983,7 +3983,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFile() {
 
     const char data[8]{};
     CORRADE_VERIFY(converter.convertToFile({
-        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{64}},
+        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{NoInit, 1792}},
         CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 1}, data}
     }, filename));
     CORRADE_COMPARE_AS(filename,
@@ -4041,7 +4041,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[8]{};
 
     /* The implementation is expected to print an error message on its own */
     Containers::String out;
@@ -4099,7 +4099,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFileThroughData() {
 
     /* doConvertToFile() should call doConvertToData() */
     CORRADE_VERIFY(converter.convertToFile({
-        CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{64}},
+        CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{NoInit, 128}},
         CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4}, data}
     }, filename));
     CORRADE_COMPARE_AS(filename,
@@ -4127,8 +4127,8 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileThroughData() {
 
     /* doConvertToFile() should call doConvertToData() */
     CORRADE_VERIFY(converter.convertToFile({
-        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{64}},
-        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 4}, data}
+        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{NoInit, 1792}},
+        CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 1}, data}
     }, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d\x0e\x02", TestSuite::Compare::FileToString);
@@ -4213,7 +4213,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileThroughDataFaile
        should be printed (the base implementation assumes the plugin does it) */
     Containers::String out;
     Error redirectError{&out};
-    CORRADE_VERIFY(!converter.convertToFile({CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 4}, data}}, filename));
+    CORRADE_VERIFY(!converter.convertToFile({CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 1}, data}}, filename));
     CORRADE_VERIFY(!Utility::Path::exists(filename));
     CORRADE_COMPARE(out, "");
 }
@@ -4376,7 +4376,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileNotImplemented()
     const char data[8]{};
     Containers::String out;
     Error redirectError{&out};
-    converter.convertToFile({CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 4}, data}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out"));
+    converter.convertToFile({CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4, 1}, data}}, Utility::Path::join(TRADE_TEST_OUTPUT_DIR, "image.out"));
     CORRADE_COMPARE(out, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 3D image conversion advertised but not implemented\n");
 }
 
@@ -4485,7 +4485,7 @@ void AbstractImageConverterTest::convertCompressed2DToFileThroughLevels() {
     if(Utility::Path::exists(filename))
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d}, Containers::Array<char>{NoInit, 128}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d\x01", TestSuite::Compare::FileToString);
 }
@@ -4507,7 +4507,7 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughLevels() {
     if(Utility::Path::exists(filename))
         CORRADE_VERIFY(Utility::Path::remove(filename));
 
-    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{64}}, filename));
+    CORRADE_VERIFY(converter.convertToFile(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {0x0f, 0x0d, 0x0e}, Containers::Array<char>{NoInit, 1792}}, filename));
     CORRADE_COMPARE_AS(filename,
         "\x0f\x0d\x0e\x01", TestSuite::Compare::FileToString);
 }
diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
index e13df3ff1..53d3f40e3 100644
--- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
@@ -4557,7 +4557,7 @@ void AbstractSceneConverterTest::addImage1DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image1DCount(), 0);
@@ -4745,7 +4745,7 @@ void AbstractSceneConverterTest::addImage2DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image2DCount(), 0);
@@ -4955,7 +4955,7 @@ void AbstractSceneConverterTest::addImage3DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image3DCount(), 0);
@@ -5118,7 +5118,7 @@ void AbstractSceneConverterTest::addImageLevels1DCompressedView() {
             CORRADE_COMPARE(name, "hello");
             CORRADE_COMPARE(imageLevels.size(), 2);
             CORRADE_VERIFY(imageLevels[1].isCompressed());
-            CORRADE_COMPARE(imageLevels[1].compressedStorage().compressedBlockSize(), Vector3i{3});
+            CORRADE_COMPARE(imageLevels[1].compressedStorage().rowLength(), 6);
             CORRADE_COMPARE(imageLevels[1].compressedFormat(), CompressedPixelFormat::Astc3x3x3RGBASrgb);
             CORRADE_COMPARE(imageLevels[1].size(), 3);
             CORRADE_COMPARE(imageLevels[1].flags(), ImageFlags1D{});
@@ -5131,13 +5131,13 @@ void AbstractSceneConverterTest::addImageLevels1DCompressedView() {
         bool addCalled = false;
     } converter;
 
-    const char imageData[6]{};
+    const char imageData[2*16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image1DCount(), 0);
     CORRADE_COMPARE(converter.add({
         CompressedImageView1D{CompressedPixelFormat::Astc3x3x3RGBASrgb, 1, imageData},
-        CompressedImageView1D{CompressedPixelStorage{}.setCompressedBlockSize({3, 3, 3}), CompressedPixelFormat::Astc3x3x3RGBASrgb, 3, imageData}
+        CompressedImageView1D{CompressedPixelStorage{}.setRowLength(6), CompressedPixelFormat::Astc3x3x3RGBASrgb, 3, imageData}
     }, "hello"), 0);
     CORRADE_VERIFY(converter.addCalled);
     CORRADE_COMPARE(converter.image1DCount(), 1);
@@ -5159,7 +5159,7 @@ void AbstractSceneConverterTest::addImageLevels1DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image1DCount(), 0);
@@ -5336,7 +5336,7 @@ void AbstractSceneConverterTest::addImageLevels2DCompressedView() {
             CORRADE_COMPARE(name, "hello");
             CORRADE_COMPARE(imageLevels.size(), 2);
             CORRADE_VERIFY(imageLevels[1].isCompressed());
-            CORRADE_COMPARE(imageLevels[1].compressedStorage().compressedBlockSize(), Vector3i{3});
+            CORRADE_COMPARE(imageLevels[1].compressedStorage().rowLength(), 6);
             CORRADE_COMPARE(imageLevels[1].compressedFormat(), CompressedPixelFormat::Astc3x3x3RGBASrgb);
             CORRADE_COMPARE(imageLevels[1].size(), (Vector2i{3, 1}));
             CORRADE_COMPARE(imageLevels[1].flags(), ImageFlag2D::Array);
@@ -5349,13 +5349,13 @@ void AbstractSceneConverterTest::addImageLevels2DCompressedView() {
         bool addCalled = false;
     } converter;
 
-    const char imageData[6]{};
+    const char imageData[2*16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image2DCount(), 0);
     CORRADE_COMPARE(converter.add({
         CompressedImageView2D{CompressedPixelFormat::Astc3x3x3RGBASrgb, {1, 1}, imageData, ImageFlag2D::Array},
-        CompressedImageView2D{CompressedPixelStorage{}.setCompressedBlockSize({3, 3, 3}), CompressedPixelFormat::Astc3x3x3RGBASrgb, {3, 1}, imageData, ImageFlag2D::Array}
+        CompressedImageView2D{CompressedPixelStorage{}.setRowLength(6), CompressedPixelFormat::Astc3x3x3RGBASrgb, {3, 1}, imageData, ImageFlag2D::Array}
     }, "hello"), 0);
     CORRADE_VERIFY(converter.addCalled);
     CORRADE_COMPARE(converter.image2DCount(), 1);
@@ -5377,7 +5377,7 @@ void AbstractSceneConverterTest::addImageLevels2DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image2DCount(), 0);
@@ -5743,7 +5743,7 @@ void AbstractSceneConverterTest::addImageLevels3DCompressedView() {
             CORRADE_COMPARE(name, "hello");
             CORRADE_COMPARE(imageLevels.size(), 2);
             CORRADE_VERIFY(imageLevels[1].isCompressed());
-            CORRADE_COMPARE(imageLevels[1].compressedStorage().compressedBlockSize(), Vector3i{3});
+            CORRADE_COMPARE(imageLevels[1].compressedStorage().rowLength(), 6);
             CORRADE_COMPARE(imageLevels[1].compressedFormat(), CompressedPixelFormat::Astc3x3x3RGBASrgb);
             CORRADE_COMPARE(imageLevels[1].size(), (Vector3i{3, 1, 1}));
             CORRADE_COMPARE(imageLevels[1].flags(), ImageFlag3D::Array);
@@ -5756,13 +5756,13 @@ void AbstractSceneConverterTest::addImageLevels3DCompressedView() {
         bool addCalled = false;
     } converter;
 
-    const char imageData[6]{};
+    const char imageData[2*16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image3DCount(), 0);
     CORRADE_COMPARE(converter.add({
         CompressedImageView3D{CompressedPixelFormat::Astc3x3x3RGBASrgb, {1, 1, 1}, imageData, ImageFlag3D::Array},
-        CompressedImageView3D{CompressedPixelStorage{}.setCompressedBlockSize({3, 3, 3}), CompressedPixelFormat::Astc3x3x3RGBASrgb, {3, 1, 1}, imageData, ImageFlag3D::Array}
+        CompressedImageView3D{CompressedPixelStorage{}.setRowLength(6), CompressedPixelFormat::Astc3x3x3RGBASrgb, {3, 1, 1}, imageData, ImageFlag3D::Array}
     }, "hello"), 0);
     CORRADE_VERIFY(converter.addCalled);
     CORRADE_COMPARE(converter.image3DCount(), 1);
@@ -5784,7 +5784,7 @@ void AbstractSceneConverterTest::addImageLevels3DFailed() {
         }
     } converter;
 
-    const char imageData[4]{};
+    const char imageData[16]{};
 
     CORRADE_VERIFY(converter.begin());
     CORRADE_COMPARE(converter.image3DCount(), 0);