Reorder tests to be IV, NV, PV in that order
Put all of the private check flags at the end