WIP rebase tests