fix base tests after rebase