diff --git a/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java b/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
index 6552a5d5681366246ea19b3eb9650cc3b6241ff5..6790266778fbde37954810dbc6acb5ede4b4279f 100644
--- a/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
+++ b/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
@@ -72,9 +72,6 @@ public class ElasticRepositoryDatastore implements ElasticRepository {
             String host = this.kmsClient.decryptString(encryptedHost);
             String portString = this.kmsClient.decryptString(encryptedPort);
             String usernameAndPassword = this.kmsClient.decryptString(encryptedConfiguration);
-            log.info("HOST:" + host );
-            log.info("PORT:" + portString );
-            log.info("UP:" + usernameAndPassword );
 
             Preconditions.checkNotNullOrEmpty(host, "host cannot be null");
             Preconditions.checkNotNullOrEmpty(portString, "port cannot be null");
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
index 06f2757f1107414644e872b4273b540effe13141..a33eb04f29489e38110525b63bc2ecdeed02375b 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
@@ -16,7 +16,6 @@ package org.opengroup.osdu.indexer.logging;
 
 import com.google.common.collect.Lists;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -32,7 +31,6 @@ import java.util.Map;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-@Ignore
 @RunWith(SpringRunner.class)
 public class AuditLoggerTest {
 
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
index 6256e1eca71ff6518bfb64ad8c19bbd1ab2df282..53773ae8efe8874d423433dcfb52a18965a66b82 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
@@ -15,12 +15,10 @@
 package org.opengroup.osdu.indexer.model;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@Ignore
 @RunWith(SpringRunner.class)
 public class ElasticTypeTest {
 
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
index 8b40af8030379b22c3db6c1f7eff4adf7e3faa10..86d2bb96b3cac4d61a597b13be3606f7c21f75b7 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
@@ -15,11 +15,11 @@
 package org.opengroup.osdu.indexer.service;
 
 import com.google.gson.internal.LinkedTreeMap;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.opengroup.osdu.indexer.util.JobStatus;
 import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
 import org.opengroup.osdu.indexer.util.parser.NumberParser;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
@@ -32,7 +32,6 @@ import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
-@Ignore
 @RunWith(SpringRunner.class)
 public class AttributeParsingServiceImplTest {
 
@@ -44,6 +43,8 @@ public class AttributeParsingServiceImplTest {
     private DateTimeParser dateTimeParser;
     @Mock
     private JaxRsDpsLog log;
+    @Mock
+    private JobStatus jobStatus;
     @InjectMocks
     private AttributeParsingServiceImpl sut;
 
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
index 8f6458f78a604aea5d32f014ba6fbaa572acaacc..b5b190e347e24c19cd447bb8a0508da416ff9c19 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
@@ -18,7 +18,6 @@ import org.apache.http.HttpStatus;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -46,7 +45,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
 
-@Ignore
 @RunWith(SpringRunner.class)
 @PrepareForTest({RestHighLevelClient.class})
 public class IndexerSchemaServiceTest {
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
index 8fe5868f4da37156647ff958b506f52605a37b19..bb572412db582bace8b91ea9f970dc2c5dfece92 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
@@ -16,9 +16,9 @@ package org.opengroup.osdu.indexer.util;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.indexer.model.IndexingStatus;
 import org.opengroup.osdu.indexer.model.OperationType;
@@ -35,7 +35,6 @@ import java.util.stream.Collectors;
 
 import static org.junit.Assert.*;
 
-@Ignore
 @RunWith(SpringRunner.class)
 public class JobStatusTest {
 
@@ -44,7 +43,7 @@ public class JobStatusTest {
 
     @Mock
     private JaxRsDpsLog log;
-    @Mock
+    @InjectMocks
     private JobStatus sut;
 
     @Test