Fixing test numbering