diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java
index 909c012f8..8fff30222 100644
--- a/src/test/java/org/openelisglobal/AppTestConfig.java
+++ b/src/test/java/org/openelisglobal/AppTestConfig.java
@@ -17,7 +17,6 @@
 import org.openelisglobal.localization.dao.LocalizationDAO;
 import org.openelisglobal.localization.service.LocalizationServiceImpl;
 import org.openelisglobal.note.dao.NoteDAO;
-import org.openelisglobal.note.daoimpl.NoteDAOImpl;
 import org.openelisglobal.note.service.NoteService;
 import org.openelisglobal.notification.service.AnalysisNotificationConfigService;
 import org.openelisglobal.notification.service.TestNotificationConfigService;
@@ -27,7 +26,6 @@
 import org.openelisglobal.organization.daoimpl.OrganizationTypeDAOImpl;
 import org.openelisglobal.organization.service.OrganizationService;
 import org.openelisglobal.organization.service.OrganizationTypeService;
-import org.openelisglobal.organization.service.OrganizationTypeServiceImpl;
 import org.openelisglobal.program.service.ImmunohistochemistrySampleService;
 import org.openelisglobal.program.service.PathologySampleService;
 import org.openelisglobal.program.service.ProgramSampleService;
@@ -348,14 +346,14 @@ public StatusOfSampleService statusOfSampleService() {
 
     @Bean
     @Profile("test")
-    public OrganizationTypeService organizationTypeService() {
-        return new OrganizationTypeServiceImpl();
+    public OrganizationTypeService OrganizationTypeService() {
+        return mock(OrganizationTypeService.class);
     }
 
     @Bean
     @Profile("test")
     public NoteDAO NoteDAO() {
-        return new NoteDAOImpl();
+        return mock(NoteDAO.class);
     }
 
     @Bean