Fix tests for last commit.