diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/AuthControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/AuthControllerTest.java
index 3a545c260..469cf5998 100644
--- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/AuthControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/AuthControllerTest.java
@@ -14,16 +14,19 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
 import edu.tamu.scholars.middleware.auth.UserTestUtility;
 import edu.tamu.scholars.middleware.auth.model.User;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 
 @AutoConfigureRestDocs
 @WebMvcTest(AuthController.class)
+@Import(value = { MiddlewareTestConfig.class })
 public class AuthControllerTest {
 
     private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/LoginControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/LoginControllerTest.java
index 12fdcd0bf..f450fc9cb 100644
--- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/LoginControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/LoginControllerTest.java
@@ -15,14 +15,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.web.servlet.MockMvc;
 
 import edu.tamu.scholars.middleware.auth.UserTestUtility;
 import edu.tamu.scholars.middleware.auth.model.User;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 
 @AutoConfigureRestDocs
 @WebMvcTest
+@Import(value = { MiddlewareTestConfig.class })
 public class LoginControllerTest {
 
     private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/LogoutControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/LogoutControllerTest.java
index b019da70c..392bed80f 100644
--- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/LogoutControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/LogoutControllerTest.java
@@ -12,14 +12,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
 import edu.tamu.scholars.middleware.auth.UserTestUtility;
 import edu.tamu.scholars.middleware.auth.model.User;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 
-@WebMvcTest
 @AutoConfigureRestDocs
+@WebMvcTest
+@Import(value = { MiddlewareTestConfig.class })
 public class LogoutControllerTest {
 
     @Autowired
diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/RegistrationControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/RegistrationControllerTest.java
index 1a791a635..aac3a3839 100644
--- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/RegistrationControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/RegistrationControllerTest.java
@@ -23,6 +23,7 @@
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
 import org.springframework.security.core.token.Token;
 import org.springframework.security.core.token.TokenService;
 import org.springframework.test.web.servlet.MockMvc;
@@ -32,11 +33,13 @@
 
 import edu.tamu.scholars.middleware.auth.RegistrationTestUtility;
 import edu.tamu.scholars.middleware.auth.controller.request.Registration;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.service.EmailService;
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 
-@WebMvcTest(RegistrationController.class)
 @AutoConfigureRestDocs
+@WebMvcTest(RegistrationController.class)
+@Import(value = { MiddlewareTestConfig.class })
 public class RegistrationControllerTest {
 
     private static final ConstraintDescriptionsHelper describeRegistration = new ConstraintDescriptionsHelper(Registration.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java
index c12d0ed5a..fed4a6156 100644
--- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java
@@ -24,15 +24,18 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
 import edu.tamu.scholars.middleware.auth.UserTestUtility;
 import edu.tamu.scholars.middleware.auth.model.User;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 
-@WebMvcTest
 @AutoConfigureRestDocs
+@WebMvcTest
+@Import(value = { MiddlewareTestConfig.class })
 public class UserControllerTest {
 
     private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/theme/controller/ThemeControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/theme/controller/ThemeControllerTest.java
index f584314aa..76bc2daa9 100644
--- a/src/test/java/edu/tamu/scholars/middleware/theme/controller/ThemeControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/theme/controller/ThemeControllerTest.java
@@ -27,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
@@ -34,6 +35,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.theme.ThemeTestUtility;
 import edu.tamu.scholars.middleware.theme.model.Style;
 import edu.tamu.scholars.middleware.theme.model.Theme;
@@ -41,6 +43,7 @@
 
 @WebMvcTest
 @AutoConfigureRestDocs
+@Import(value = { MiddlewareTestConfig.class })
 public class ThemeControllerTest {
 
     private static final ConstraintDescriptionsHelper describeTheme = new ConstraintDescriptionsHelper(Theme.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/view/controller/AbstractViewControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/view/controller/AbstractViewControllerTest.java
index a4cfc27e9..3c615daf3 100644
--- a/src/test/java/edu/tamu/scholars/middleware/view/controller/AbstractViewControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/view/controller/AbstractViewControllerTest.java
@@ -11,8 +11,8 @@
 import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.view.model.View;
 
-@WebMvcTest
 @AutoConfigureRestDocs
+@WebMvcTest
 @Import(MiddlewareTestConfig.class)
 public abstract class AbstractViewControllerTest<V extends View> {
 
diff --git a/src/test/java/edu/tamu/scholars/middleware/view/controller/DataAndAnalyticsViewControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/view/controller/DataAndAnalyticsViewControllerTest.java
index 5946bb750..05540929f 100644
--- a/src/test/java/edu/tamu/scholars/middleware/view/controller/DataAndAnalyticsViewControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/view/controller/DataAndAnalyticsViewControllerTest.java
@@ -31,7 +31,6 @@
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 import edu.tamu.scholars.middleware.view.model.DataAndAnalyticsView;
 
-// TODO: mock calls to repo
 public class DataAndAnalyticsViewControllerTest extends AbstractViewControllerTest<DataAndAnalyticsView> {
 
     private static final ConstraintDescriptionsHelper describeDataAndAnalyticsView = new ConstraintDescriptionsHelper(DataAndAnalyticsView.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/view/controller/DirectoryViewControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/view/controller/DirectoryViewControllerTest.java
index c5b2333d6..6e29fcde0 100644
--- a/src/test/java/edu/tamu/scholars/middleware/view/controller/DirectoryViewControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/view/controller/DirectoryViewControllerTest.java
@@ -31,7 +31,6 @@
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 import edu.tamu.scholars.middleware.view.model.DirectoryView;
 
-// TODO: mock calls to repo
 public class DirectoryViewControllerTest extends AbstractViewControllerTest<DirectoryView> {
 
     private static final ConstraintDescriptionsHelper describeDirectoryView = new ConstraintDescriptionsHelper(DirectoryView.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/view/controller/DiscoveryViewControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/view/controller/DiscoveryViewControllerTest.java
index 74146c8f5..48a0fcc21 100644
--- a/src/test/java/edu/tamu/scholars/middleware/view/controller/DiscoveryViewControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/view/controller/DiscoveryViewControllerTest.java
@@ -31,7 +31,6 @@
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 import edu.tamu.scholars.middleware.view.model.DiscoveryView;
 
-// TODO: mock calls to repo
 public class DiscoveryViewControllerTest extends AbstractViewControllerTest<DiscoveryView> {
 
     private static final ConstraintDescriptionsHelper describeDiscoveryView = new ConstraintDescriptionsHelper(DiscoveryView.class);
diff --git a/src/test/java/edu/tamu/scholars/middleware/view/controller/DisplayViewControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/view/controller/DisplayViewControllerTest.java
index 6eb185cd0..c66032e0d 100644
--- a/src/test/java/edu/tamu/scholars/middleware/view/controller/DisplayViewControllerTest.java
+++ b/src/test/java/edu/tamu/scholars/middleware/view/controller/DisplayViewControllerTest.java
@@ -31,7 +31,6 @@
 import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
 import edu.tamu.scholars.middleware.view.model.DisplayView;
 
-// TODO: mock calls to repo
 public class DisplayViewControllerTest extends AbstractViewControllerTest<DisplayView> {
 
     private static final ConstraintDescriptionsHelper describeDisplayView = new ConstraintDescriptionsHelper(DisplayView.class);