New v3.1 images
Refined test code