Change PKCS#7 test data to take account of removal of