Fix tests.
Merge remote-tracking branch 'upstream/master'