Re-organized test images