Fix track unit tests.
Merge branch 'wikiatracker-amd' into dev