ref #371 -- bunch more tests, and a little tweak to image init