Update tests to match the output we actually produce
am: 8bf252d4d6

Change-Id: Icb9d0f26e6a0c9671bca6fba5fffbe3b0f32fa07