diff --git a/test/shapes/p01_shape24.bmp b/test/shapes/p01_shape24.bmp
deleted file mode 100644
index 290e93d9c..000000000
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 a1b8d9561..000000000
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 5adca298f..000000000
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 61e411bb7..000000000
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 6497a7b0d..000000000
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 8ad7c9ac8..000000000
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 e2378679f..000000000
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 28f8800f6..000000000
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 ad288ace5..000000000
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 8cf612986..000000000
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 771ebc053..000000000
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 29d503168..000000000
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 e2d62a53d..000000000
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 1ca14f11d..000000000
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 4cc257688..000000000
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 04afd793c..000000000
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 017c1ed77..000000000
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 fa8012cae..000000000
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 d2376666d..000000000
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 9aeaa0810..000000000
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 332f86349..000000000
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 4d1d25e9f..000000000
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 920f9070e..000000000
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 e5a7c0043..000000000
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 250d267d1..000000000
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 4d1cd014e..000000000
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 42b5a7f34..000000000
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 bc1faf4e7..000000000
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 4330e4454..000000000
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 64fb5c372..000000000
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 653530786..000000000
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 406d20a81..000000000
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 36f1ba2c6..000000000
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 582cf994e..000000000
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 59377200b..000000000
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 70215db59..000000000
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 b656da816..000000000
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 822b896e1..000000000
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 ae83f5a8c..000000000
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 d6f981f58..000000000
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 33b99588e..000000000
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 6954a5d91..000000000
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 ada5aefb8..000000000
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 5b3f5509b..000000000
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 1f2a1d230..000000000
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 0b4d4221c..000000000
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 e18c2c2ad..000000000
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 ee3ecf9be..000000000
Binary files a/test/shapes/trollface_32alpha.bmp and /dev/null differ