fstests: renumber tests after merge