Adjust register numbers in tests to compensate for the