Fix tests.
Merge branch 'foo'