Minor bugfixes and additional test images