fix the test rebase