Fix tests wrt commit 0c31a4fc