5eaddca Better ID allocation in test-suite