Test: Introduce order independent testId to replace testNumber

This is a POC. Bikeshed please.