revise test numbering for forward merging