[minor] Added an id to every instance
[test] Hopefully reduced errors