diff --git a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/PageTestConfiguration.java b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/PageTestConfiguration.java
index dfda3534..ab2f3934 100644
--- a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/PageTestConfiguration.java
+++ b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/PageTestConfiguration.java
@@ -2,6 +2,9 @@ package hirs.attestationca.portal.page;
 
 import hirs.attestationca.portal.PageConfiguration;
 import hirs.attestationca.persist.entity.userdefined.certificate.CertificateAuthorityCredential;
+import jakarta.xml.bind.DatatypeConverter;
+import org.hibernate.AssertionFailure;
+import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.*;
@@ -14,14 +17,19 @@ import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
 import javax.sql.DataSource;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.security.*;
 import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
 import java.util.Properties;
+import java.util.*;
 
 /**
  * A configuration class for testing Attestation CA Portal classes that require a database.
@@ -108,6 +116,8 @@ public class PageTestConfiguration {
         return hibernateProperties;
     }
 
+
+
     /**
      * Generates JPA transaction manager.
      *
@@ -119,4 +129,34 @@ public class PageTestConfiguration {
         transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
         return transactionManager;
     }
+
+    @Bean
+    public PrivateKey privateKey() {
+        try {
+            KeyPairGenerator keyGenerator = KeyPairGenerator.getInstance("RSA");
+            PrivateKey dummy_privKey = keyGenerator.generateKeyPair().getPrivate();
+            return dummy_privKey;
+        }
+        catch (GeneralSecurityException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * @return a blank {@link java.security.KeyStore}
+     * this function is only used to override the PersistenceJPAConfig keyStore bean during test
+     */
+    @Bean
+    public KeyStore keyStore() {
+        // attempt to create the key store. if that fails, print a message before failing.
+        try {
+            KeyStore dummy_keyStore = KeyStore.getInstance("JKS");
+            dummy_keyStore.load(null);
+
+            return dummy_keyStore;
+        } catch (Exception ex) {
+            System.out.println("\nEncountered error while creating a fake (blank) key store for testing");
+            throw new BeanInitializationException(ex.getMessage(), ex);
+        }
+    }
 }
diff --git a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/DevicePageControllerTest.java b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/DevicePageControllerTest.java
index 36eccf21..eb9b8ab3 100644
--- a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/DevicePageControllerTest.java
+++ b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/DevicePageControllerTest.java
@@ -26,7 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  */
 public class DevicePageControllerTest extends PageControllerTest {
 
-    private static final String DEVICE_NAME = "Test Device - dell-lat-l-02";
+    private static final String DEVICE_NAME = "Test Device";
     private static final String TEST_ENDORSEMENT_CREDENTIAL
             = "/endorsement_credentials/tpmcert.pem";
     private static final String TEST_ENDORSEMENT_CREDENTIAL_2