Merge "Update PictureTest unit test"