Fix unit tests after commit 85423f0