Merge "Keep test numbering consistent"