[Rebase!] Fix tests.