Fix tests following Gérard Talbot review comments