Rounded out the tracker tests
Removed legacy old test