Tracker refactoring and specs
Tracker specs