Fix tests.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Merge remote-tracking branch 'upstream/master'