Fix unit tests broken by 1e78a5df7