update additional-tracking-data-structure and updated tests