test suite renumbering and fixes