diff --git a/doc/source/contributor/plugin/crypto.rst b/doc/source/contributor/plugin/crypto.rst
index fb070a59e..ec06b20e2 100644
--- a/doc/source/contributor/plugin/crypto.rst
+++ b/doc/source/contributor/plugin/crypto.rst
@@ -43,7 +43,7 @@ data models.
 
 .. autoclass:: GenerateDTO
 
-.. autoclass:: GenerateDTO
+.. autoclass:: ResponseDTO
 
 Plugin Base Class
 =================
diff --git a/functionaltests/api/v1/functional/test_acls.py b/functionaltests/api/v1/functional/test_acls.py
index 778e702b0..db19ca268 100644
--- a/functionaltests/api/v1/functional/test_acls.py
+++ b/functionaltests/api/v1/functional/test_acls.py
@@ -334,7 +334,7 @@ class AclTestCase(base.TestCase):
 
         secret_no_payload = {
             "name": "AES key",
-            "expiration": "2020-02-28T19:14:44.180394",
+            "expiration": "2030-02-28T19:14:44.180394",
             "algorithm": "aes",
             "bit_length": 256,
             "mode": "cbc",
diff --git a/functionaltests/api/v1/functional/test_consumers.py b/functionaltests/api/v1/functional/test_consumers.py
index 37594372c..6883e3d47 100644
--- a/functionaltests/api/v1/functional/test_consumers.py
+++ b/functionaltests/api/v1/functional/test_consumers.py
@@ -26,7 +26,7 @@ from functionaltests.api.v1.models import secret_models
 
 create_secret_data = {
     "name": "AES key",
-    "expiration": "2020-02-28T19:14:44.180394",
+    "expiration": "2030-02-28T19:14:44.180394",
     "algorithm": "aes",
     "bit_length": 256,
     "mode": "cbc",
diff --git a/functionaltests/api/v1/functional/test_containers.py b/functionaltests/api/v1/functional/test_containers.py
index 0e7cf159b..26ceec544 100644
--- a/functionaltests/api/v1/functional/test_containers.py
+++ b/functionaltests/api/v1/functional/test_containers.py
@@ -109,7 +109,7 @@ class BaseContainerTestCase(base.TestCase):
     def _create_a_secret(self):
         secret_defaults_data = {
             "name": "AES key",
-            "expiration": "2020-02-28T19:14:44.180394",
+            "expiration": "2030-02-28T19:14:44.180394",
             "algorithm": "aes",
             "bit_length": 256,
             "mode": "cbc",
@@ -389,7 +389,7 @@ class ContainersPagingTestCase(base.PagingTestCase):
     def _create_a_secret(self):
         secret_defaults_data = {
             "name": "AES key",
-            "expiration": "2020-02-28T19:14:44.180394",
+            "expiration": "2030-02-28T19:14:44.180394",
             "algorithm": "aes",
             "bit_length": 256,
             "mode": "cbc",
diff --git a/functionaltests/api/v1/functional/test_secrets.py b/functionaltests/api/v1/functional/test_secrets.py
index d3cc77531..afc2cbe04 100644
--- a/functionaltests/api/v1/functional/test_secrets.py
+++ b/functionaltests/api/v1/functional/test_secrets.py
@@ -84,7 +84,7 @@ def get_passphrase_req():
 def get_default_data():
     return {
         "name": "AES key",
-        "expiration": "2020-02-28T19:14:44.180394",
+        "expiration": "2030-02-28T19:14:44.180394",
         "algorithm": "aes",
         "bit_length": 256,
         "mode": "cbc",
@@ -135,7 +135,7 @@ class SecretsTestCase(base.TestCase):
 
         self.default_secret_create_two_phase_data = {
             "name": "AES key",
-            "expiration": "2020-02-28T19:14:44.180394",
+            "expiration": "2030-02-28T19:14:44.180394",
             "algorithm": "aes",
             "bit_length": 256,
             "mode": "cbc",
diff --git a/functionaltests/api/v1/smoke/test_consumers.py b/functionaltests/api/v1/smoke/test_consumers.py
index f662ad033..b2fb62915 100644
--- a/functionaltests/api/v1/smoke/test_consumers.py
+++ b/functionaltests/api/v1/smoke/test_consumers.py
@@ -26,7 +26,7 @@ from functionaltests.api.v1.models import secret_models
 
 create_secret_data = {
     "name": "AES key",
-    "expiration": "2020-02-28T19:14:44.180394",
+    "expiration": "2030-02-28T19:14:44.180394",
     "algorithm": "aes",
     "bit_length": 256,
     "mode": "cbc",
diff --git a/functionaltests/api/v1/smoke/test_containers.py b/functionaltests/api/v1/smoke/test_containers.py
index a83f5cb5d..d57ca2e80 100644
--- a/functionaltests/api/v1/smoke/test_containers.py
+++ b/functionaltests/api/v1/smoke/test_containers.py
@@ -23,7 +23,7 @@ from functionaltests.api.v1.models import secret_models
 
 create_secret_defaults_data = {
     "name": "AES key",
-    "expiration": "2020-02-28T19:14:44.180394",
+    "expiration": "2030-02-28T19:14:44.180394",
     "algorithm": "aes",
     "bit_length": 256,
     "mode": "cbc",
diff --git a/functionaltests/api/v1/smoke/test_secrets.py b/functionaltests/api/v1/smoke/test_secrets.py
index 4f126b3a4..fcab48097 100644
--- a/functionaltests/api/v1/smoke/test_secrets.py
+++ b/functionaltests/api/v1/smoke/test_secrets.py
@@ -24,7 +24,7 @@ from functionaltests.api.v1.models import secret_models
 
 default_secret_create_data = {
     "name": "AES key",
-    "expiration": "2020-02-28T19:14:44.180394",
+    "expiration": "2030-02-28T19:14:44.180394",
     "algorithm": "aes",
     "bit_length": 256,
     "mode": "cbc",
@@ -61,7 +61,7 @@ default_secret_create_emptystrings_data = {
 
 default_secret_create_two_phase_data = {
     "name": "AES key",
-    "expiration": "2020-02-28T19:14:44.180394",
+    "expiration": "2030-02-28T19:14:44.180394",
     "algorithm": "aes",
     "bit_length": 256,
     "mode": "cbc",