Add tracking of toolsets and test names.