Initial pass at re-numbering tests to prevent overlap