Port the improved 087 test back to test 086.

Change-Id: Id4dffe23fb60c4e703a0c4de0fab1a0876b2756a
2 files changed