overlay: renumber tests after merge