fix broken tests post-rebase