diff --git a/msgwriter_test.go b/msgwriter_test.go
index 09bfa55..124ed3b 100644
--- a/msgwriter_test.go
+++ b/msgwriter_test.go
@@ -679,7 +679,7 @@ func TestMsgWriter_writeBody(t *testing.T) {
 		buffer := bytes.NewBuffer(nil)
 		msgwriter.writer = buffer
 		message := testMessage(t)
-		msgwriter.writeBody(message.parts[0].writeFunc, NoEncoding)
+		msgwriter.writeBody(message.parts[0].writeFunc, NoEncoding, false)
 		if msgwriter.err != nil {
 			t.Errorf("writeBody failed to write: %s", msgwriter.err)
 		}
@@ -687,7 +687,7 @@ func TestMsgWriter_writeBody(t *testing.T) {
 	t.Run("writeBody on NoEncoding fails on write", func(t *testing.T) {
 		msgwriter.writer = failReadWriteSeekCloser{}
 		message := testMessage(t)
-		msgwriter.writeBody(message.parts[0].writeFunc, NoEncoding)
+		msgwriter.writeBody(message.parts[0].writeFunc, NoEncoding, false)
 		if msgwriter.err == nil {
 			t.Errorf("writeBody succeeded, expected error")
 		}
@@ -701,7 +701,7 @@ func TestMsgWriter_writeBody(t *testing.T) {
 		writeFunc := func(io.Writer) (int64, error) {
 			return 0, errors.New("intentional write failure")
 		}
-		msgwriter.writeBody(writeFunc, NoEncoding)
+		msgwriter.writeBody(writeFunc, NoEncoding, false)
 		if msgwriter.err == nil {
 			t.Errorf("writeBody succeeded, expected error")
 		}
@@ -712,7 +712,7 @@ func TestMsgWriter_writeBody(t *testing.T) {
 	t.Run("writeBody Quoted-Printable fails on write", func(t *testing.T) {
 		msgwriter.writer = failReadWriteSeekCloser{}
 		message := testMessage(t)
-		msgwriter.writeBody(message.parts[0].writeFunc, EncodingQP)
+		msgwriter.writeBody(message.parts[0].writeFunc, EncodingQP, false)
 		if msgwriter.err == nil {
 			t.Errorf("writeBody succeeded, expected error")
 		}
@@ -804,5 +804,3 @@ func TestMsgWriter_writeMsg_SMime(t *testing.T) {
 		t.Errorf("writeMsg failed. Unable to find Content-Type")
 	}
 }
-
-
diff --git a/pkcs7_test.go b/pkcs7_test.go
index e84f8c1..e67e7e9 100644
--- a/pkcs7_test.go
+++ b/pkcs7_test.go
@@ -75,7 +75,7 @@ func createTestCertificate() (*certKeyPair, error) {
 }
 
 func createTestCertificateByIssuer(name string, issuer *certKeyPair) (*certKeyPair, error) {
-	priv, err := rsa.GenerateKey(rand.Reader, 1024)
+	priv, err := rsa.GenerateKey(rand.Reader, 2048)
 	if err != nil {
 		return nil, err
 	}