Add image data tests, minor fixes for array data tests.