Fix small test fails introduced in the commit 27f12f7