Article and code updates for unit test (issue 18438002)

Clean version of earlier patches to get around some git funkiness on my laptop.

BUG=

Review URL: https://codereview.appspot.com/11749043