Improving our test tracks