Make tests pass after rebase