Update some more test numbers to reflect the new import statements