Fix tests after #7526