diff --git a/pgpainless-core/src/test/java/org/pgpainless/example/Encrypt.java b/pgpainless-core/src/test/java/org/pgpainless/example/Encrypt.java
index 329e55e6..6d3f8d43 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/example/Encrypt.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/example/Encrypt.java
@@ -32,6 +32,7 @@ import org.bouncycastle.util.io.Streams;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.DocumentSignatureType;
+import org.pgpainless.decryption_verification.ConsumerOptions;
 import org.pgpainless.decryption_verification.DecryptionStream;
 import org.pgpainless.decryption_verification.OpenPgpMetadata;
 import org.pgpainless.encryption_signing.EncryptionOptions;
@@ -88,10 +89,10 @@ public class Encrypt {
         // Decrypt and verify signatures
         DecryptionStream decryptor = PGPainless.decryptAndOrVerify()
                 .onInputStream(new ByteArrayInputStream(encryptedMessage.getBytes(StandardCharsets.UTF_8)))
-                .decryptWith(protectorBob, keyBob)
-                .verifyWith(certificateAlice)
-                .ignoreMissingPublicKeys()
-                .build();
+                .withOptions(new ConsumerOptions()
+                        .addDecryptionKey(keyBob, protectorBob)
+                        .addVerificationCert(certificateAlice)
+                );
 
         ByteArrayOutputStream plaintext = new ByteArrayOutputStream();
 
@@ -133,9 +134,7 @@ public class Encrypt {
         // Decrypt
         DecryptionStream decryptor = PGPainless.decryptAndOrVerify()
                 .onInputStream(new ByteArrayInputStream(asciiCiphertext.getBytes(StandardCharsets.UTF_8)))
-                .decryptWith(Passphrase.fromPassword("p4ssphr4s3"))
-                .doNotVerify()
-                .build();
+                .withOptions(new ConsumerOptions().addDecryptionPassphrase(Passphrase.fromPassword("p4ssphr4s3")));
 
         ByteArrayOutputStream plaintext = new ByteArrayOutputStream();
         Streams.pipeAll(decryptor, plaintext);
diff --git a/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java b/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
index 7899f97c..ec087482 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
@@ -228,15 +228,17 @@ public class ModifyKeys {
      */
     @Test
     public void revokeUserId() throws PGPException {
+        SecretKeyRingProtector protector = SecretKeyRingProtector.unlockAllKeysWith(
+                Passphrase.fromPassword(originalPassphrase), secretKey);
         secretKey = PGPainless.modifyKeyRing(secretKey)
-                .addUserId("alcie@pgpainless.org", SecretKeyRingProtector.unprotectedKeys())
+                .addUserId("alcie@pgpainless.org", protector)
                 .done();
         // Initially the user-id is valid
         assertTrue(PGPainless.inspectKeyRing(secretKey).isUserIdValid("alcie@pgpainless.org"));
 
         // Revoke the second user-id
         secretKey = PGPainless.modifyKeyRing(secretKey)
-                .revokeUserId("alcie@pgpainless.org", SecretKeyRingProtector.unprotectedKeys())
+                .revokeUserId("alcie@pgpainless.org", protector)
                 .done();
         // Now the user-id is no longer valid
         assertFalse(PGPainless.inspectKeyRing(secretKey).isUserIdValid("alcie@pgpainless.org"));