Keep the information returned from Image.all w/ passing cane tests

This is exactly like #43, but I've fixed the issues that made the build fail.

I have no idea if the proper way to do this is to make a PR on @yelvert's fork or to make a PR on this repo directly, so if I've chosen the wrong path I'll happily submit a patch to #43 instead.