Merge "Fix attestation test." into pi-dev