Updated generation script to match reality.
More interesting if we occasionally have some failures.
More easily sorted test names.