Changed the tests to using new static tracker