XXX: check() id-related improvements + tests