Also prune unused cores for cores changes tracking
Fix a broken test that lead cores changes tracking NOT to be working (always null...)