Fix broken tests after commit 7c9056f