GPII-177: Updated tracking entries in tests and examples to be in the proper array'ed format.