Fix unit tests broken by 990b82d8dec