Merge pull request #570 from jrperritt/fix-image-tests

fixes for image unit tests