Modified tests to account for new numbering system.