Add more cert shuffling