(More use of synchro helpers)
Finished using sync helpers.
Added some test cases for the tracker.

(Also fixed a bug found by test cases.)