Fixed timing data tracking bug and wrote tests to check for it in the future