Cleanup tracking some more

Fix id'ing, which was broken

Add a regression test for id'ing