Fix tests on Travis.
Merge branch 'fix-tests'