diff --git a/test/shapes/p01_shape24.bmp b/test/shapes/p01_shape24.bmp
deleted file mode 100644
index 290e93d9c7..0000000000
Binary files a/test/shapes/p01_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p01_shape32alpha.bmp b/test/shapes/p01_shape32alpha.bmp
deleted file mode 100644
index a1b8d95619..0000000000
Binary files a/test/shapes/p01_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p01_shape8.bmp b/test/shapes/p01_shape8.bmp
deleted file mode 100644
index 5adca298f7..0000000000
Binary files a/test/shapes/p01_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p02_shape24.bmp b/test/shapes/p02_shape24.bmp
deleted file mode 100644
index 61e411bb77..0000000000
Binary files a/test/shapes/p02_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p02_shape32alpha.bmp b/test/shapes/p02_shape32alpha.bmp
deleted file mode 100644
index 6497a7b0d8..0000000000
Binary files a/test/shapes/p02_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p02_shape8.bmp b/test/shapes/p02_shape8.bmp
deleted file mode 100644
index 8ad7c9ac8b..0000000000
Binary files a/test/shapes/p02_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p03_shape24.bmp b/test/shapes/p03_shape24.bmp
deleted file mode 100644
index e2378679fa..0000000000
Binary files a/test/shapes/p03_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p03_shape8.bmp b/test/shapes/p03_shape8.bmp
deleted file mode 100644
index 28f8800f63..0000000000
Binary files a/test/shapes/p03_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p04_shape1.bmp b/test/shapes/p04_shape1.bmp
deleted file mode 100644
index ad288ace53..0000000000
Binary files a/test/shapes/p04_shape1.bmp and /dev/null differ
diff --git a/test/shapes/p04_shape24.bmp b/test/shapes/p04_shape24.bmp
deleted file mode 100644
index 8cf6129863..0000000000
Binary files a/test/shapes/p04_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p04_shape32alpha.bmp b/test/shapes/p04_shape32alpha.bmp
deleted file mode 100644
index 771ebc0533..0000000000
Binary files a/test/shapes/p04_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p04_shape8.bmp b/test/shapes/p04_shape8.bmp
deleted file mode 100644
index 29d5031683..0000000000
Binary files a/test/shapes/p04_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p05_shape8.bmp b/test/shapes/p05_shape8.bmp
deleted file mode 100644
index e2d62a53d4..0000000000
Binary files a/test/shapes/p05_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p06_shape1alpha.bmp b/test/shapes/p06_shape1alpha.bmp
deleted file mode 100644
index 1ca14f11db..0000000000
Binary files a/test/shapes/p06_shape1alpha.bmp and /dev/null differ
diff --git a/test/shapes/p06_shape24.bmp b/test/shapes/p06_shape24.bmp
deleted file mode 100644
index 4cc257688f..0000000000
Binary files a/test/shapes/p06_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p06_shape32alpha.bmp b/test/shapes/p06_shape32alpha.bmp
deleted file mode 100644
index 04afd793cd..0000000000
Binary files a/test/shapes/p06_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p06_shape8.bmp b/test/shapes/p06_shape8.bmp
deleted file mode 100644
index 017c1ed776..0000000000
Binary files a/test/shapes/p06_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p07_shape24.bmp b/test/shapes/p07_shape24.bmp
deleted file mode 100644
index fa8012cae8..0000000000
Binary files a/test/shapes/p07_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p07_shape32alpha.bmp b/test/shapes/p07_shape32alpha.bmp
deleted file mode 100644
index d2376666de..0000000000
Binary files a/test/shapes/p07_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p07_shape8.bmp b/test/shapes/p07_shape8.bmp
deleted file mode 100644
index 9aeaa0810f..0000000000
Binary files a/test/shapes/p07_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p08_shape24.bmp b/test/shapes/p08_shape24.bmp
deleted file mode 100644
index 332f863499..0000000000
Binary files a/test/shapes/p08_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p08_shape32alpha.bmp b/test/shapes/p08_shape32alpha.bmp
deleted file mode 100644
index 4d1d25e9ff..0000000000
Binary files a/test/shapes/p08_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p08_shape8.bmp b/test/shapes/p08_shape8.bmp
deleted file mode 100644
index 920f9070ee..0000000000
Binary files a/test/shapes/p08_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p09_shape24.bmp b/test/shapes/p09_shape24.bmp
deleted file mode 100644
index e5a7c0043d..0000000000
Binary files a/test/shapes/p09_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p09_shape32alpha.bmp b/test/shapes/p09_shape32alpha.bmp
deleted file mode 100644
index 250d267d14..0000000000
Binary files a/test/shapes/p09_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p09_shape8.bmp b/test/shapes/p09_shape8.bmp
deleted file mode 100644
index 4d1cd014ec..0000000000
Binary files a/test/shapes/p09_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p10_shape1.bmp b/test/shapes/p10_shape1.bmp
deleted file mode 100644
index 42b5a7f347..0000000000
Binary files a/test/shapes/p10_shape1.bmp and /dev/null differ
diff --git a/test/shapes/p10_shape24.bmp b/test/shapes/p10_shape24.bmp
deleted file mode 100644
index bc1faf4e7b..0000000000
Binary files a/test/shapes/p10_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p10_shape32alpha.bmp b/test/shapes/p10_shape32alpha.bmp
deleted file mode 100644
index 4330e44548..0000000000
Binary files a/test/shapes/p10_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p10_shape8.bmp b/test/shapes/p10_shape8.bmp
deleted file mode 100644
index 64fb5c3720..0000000000
Binary files a/test/shapes/p10_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p11_shape24.bmp b/test/shapes/p11_shape24.bmp
deleted file mode 100644
index 6535307862..0000000000
Binary files a/test/shapes/p11_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p11_shape32alpha.bmp b/test/shapes/p11_shape32alpha.bmp
deleted file mode 100644
index 406d20a815..0000000000
Binary files a/test/shapes/p11_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p11_shape8.bmp b/test/shapes/p11_shape8.bmp
deleted file mode 100644
index 36f1ba2c6b..0000000000
Binary files a/test/shapes/p11_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p12_shape24.bmp b/test/shapes/p12_shape24.bmp
deleted file mode 100644
index 582cf994e2..0000000000
Binary files a/test/shapes/p12_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p12_shape8.bmp b/test/shapes/p12_shape8.bmp
deleted file mode 100644
index 59377200bb..0000000000
Binary files a/test/shapes/p12_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p13_shape24.bmp b/test/shapes/p13_shape24.bmp
deleted file mode 100644
index 70215db590..0000000000
Binary files a/test/shapes/p13_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p13_shape32alpha.bmp b/test/shapes/p13_shape32alpha.bmp
deleted file mode 100644
index b656da8165..0000000000
Binary files a/test/shapes/p13_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p13_shape8.bmp b/test/shapes/p13_shape8.bmp
deleted file mode 100644
index 822b896e1c..0000000000
Binary files a/test/shapes/p13_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p14_shape24.bmp b/test/shapes/p14_shape24.bmp
deleted file mode 100644
index ae83f5a8ce..0000000000
Binary files a/test/shapes/p14_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p14_shape8.bmp b/test/shapes/p14_shape8.bmp
deleted file mode 100644
index d6f981f58a..0000000000
Binary files a/test/shapes/p14_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p15_shape24.bmp b/test/shapes/p15_shape24.bmp
deleted file mode 100644
index 33b99588e4..0000000000
Binary files a/test/shapes/p15_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p15_shape32alpha.bmp b/test/shapes/p15_shape32alpha.bmp
deleted file mode 100644
index 6954a5d91c..0000000000
Binary files a/test/shapes/p15_shape32alpha.bmp and /dev/null differ
diff --git a/test/shapes/p15_shape8.bmp b/test/shapes/p15_shape8.bmp
deleted file mode 100644
index ada5aefb83..0000000000
Binary files a/test/shapes/p15_shape8.bmp and /dev/null differ
diff --git a/test/shapes/p16_shape1.bmp b/test/shapes/p16_shape1.bmp
deleted file mode 100644
index 5b3f5509ba..0000000000
Binary files a/test/shapes/p16_shape1.bmp and /dev/null differ
diff --git a/test/shapes/p16_shape24.bmp b/test/shapes/p16_shape24.bmp
deleted file mode 100644
index 1f2a1d230c..0000000000
Binary files a/test/shapes/p16_shape24.bmp and /dev/null differ
diff --git a/test/shapes/p16_shape8.bmp b/test/shapes/p16_shape8.bmp
deleted file mode 100644
index 0b4d4221c5..0000000000
Binary files a/test/shapes/p16_shape8.bmp and /dev/null differ
diff --git a/test/shapes/trollface_24.bmp b/test/shapes/trollface_24.bmp
deleted file mode 100644
index e18c2c2ad1..0000000000
Binary files a/test/shapes/trollface_24.bmp and /dev/null differ
diff --git a/test/shapes/trollface_32alpha.bmp b/test/shapes/trollface_32alpha.bmp
deleted file mode 100644
index ee3ecf9be4..0000000000
Binary files a/test/shapes/trollface_32alpha.bmp and /dev/null differ