Update for 2.8 random test IDs