A few more fixes for testing in the repo.

These issues were hidden last time I was testing because I couldn't
actually bring in pub via DEPS.

R=rnystrom@google.com

Review URL: https://codereview.chromium.org//1162603009