Fix up image tests