Upgrades tracker finished.
Fixing observer test and an optimization seen in ggtracker.