fix tests after rebase