Test: Introduce order independent testId to replace testNumber

This is a POC. Bikeshed please.
If we're dropping `testNumber` now, the usage here and above should also be removed.