Fix pessimistic unit tests post-4671