Merge "Re-order skip checks for attestation tests"