Track map
Update to laps
Fixing tests