tracker: Fix up to pass current unit test.