Remove excess renumbering of testfile helper methods