Rebase fixes
One working test