fix up tests

R=sigmund@google.com

Review URL: https://codereview.chromium.org//1019243005
4 files changed