Update testbench to work with included track addresses

[dinyar]

In the barrel area we will use track addresses for the cancel-out, this should be covered by the testbench.