Also update the norid test suite