Rebase the test