Improve ids tests

cf !727 (comment 370704)