Fix unit tests broken by commit d994ca86