improve rebase test