Fix rebase issue in tests.