The "legacy" syntax is still tolerated, so a number after "track" is
skipped over. Also add a regression test in which the new syntax is
used, the old regression test is retained as a legacy test.