Reviewed-by: robm

Summary: backport of a test that was forgotten in the original backport
Reviewed-by: psandoz

Reviewed-by: darcy, weijun

Reviewed-by: ohair