Fix unittests broken by commit 2bb5c9115f