fix broken tests after rebase