Fix unit tests broken by 93961744c