Clean up some image tests. am: a8f39186b2
am: 272f4f2633

Change-Id: I70dea6e321268052ed4a4c02a5f942d5f85f9aa1