Right number of extra tests, remove references to old _XS_next_prime
First cut znlog