diff --git a/wilma-service-api/src/main/java/com/epam/wilma/service/application/WilmaApplication.java b/wilma-service-api/src/main/java/com/epam/wilma/service/application/WilmaApplication.java
index a6d96c45..194b0588 100644
--- a/wilma-service-api/src/main/java/com/epam/wilma/service/application/WilmaApplication.java
+++ b/wilma-service-api/src/main/java/com/epam/wilma/service/application/WilmaApplication.java
@@ -39,8 +39,6 @@
 public class WilmaApplication {
     private static final Logger LOG = LoggerFactory.getLogger(WilmaApplication.class);
 
-    private static final JSONObject EMPTY_JSON = new JSONObject();
-
     private static final String VERSION_INFO_URL_POSTFIX = "config/public/version";
     private static final String ACTUAL_LOAD_INFO_URL_POSTFIX = "config/public/actualload";
     private static final String SHUTDOWN_URL_POSTFIX = "config/admin/shutdown";
diff --git a/wilma-service-api/src/main/java/com/epam/wilma/service/configuration/MessageLoggingConfiguration.java b/wilma-service-api/src/main/java/com/epam/wilma/service/configuration/MessageLoggingConfiguration.java
index 6e443dfd..f9bc644c 100644
--- a/wilma-service-api/src/main/java/com/epam/wilma/service/configuration/MessageLoggingConfiguration.java
+++ b/wilma-service-api/src/main/java/com/epam/wilma/service/configuration/MessageLoggingConfiguration.java
@@ -72,7 +72,7 @@ public MessageLoggingControlStatus getMessageLoggingStatus() {
             Boolean requestLogging = (Boolean) o.get("requestLogging");
             Boolean responseLogging = (Boolean) o.get("responseLogging");
 
-            if (requestLogging & responseLogging) {
+            if (requestLogging && responseLogging) {
                 status = MessageLoggingControlStatus.ON;
             } else {
                 status = MessageLoggingControlStatus.OFF;
diff --git a/wilma-service-api/src/main/java/com/epam/wilma/service/domain/WilmaLoadInformation.java b/wilma-service-api/src/main/java/com/epam/wilma/service/domain/WilmaLoadInformation.java
index 1e4f34de..14121323 100644
--- a/wilma-service-api/src/main/java/com/epam/wilma/service/domain/WilmaLoadInformation.java
+++ b/wilma-service-api/src/main/java/com/epam/wilma/service/domain/WilmaLoadInformation.java
@@ -42,9 +42,20 @@ public WilmaLoadInformation(final JSONObject jsonObject) {
         loggerQueueSize = (Integer) jsonObject.get("loggerQueueSize");
     }
 
-    public Integer getDeletedFilesCount() { return deletedFilesCount; }
-    public Integer getCountOfMessages() { return countOfMessages; }
-    public Integer getResponseQueueSize() { return responseQueueSize; }
-    public Integer getLoggerQueueSize() { return loggerQueueSize; }
+    public Integer getDeletedFilesCount() {
+        return deletedFilesCount;
+    }
+
+    public Integer getCountOfMessages() {
+        return countOfMessages;
+    }
+
+    public Integer getResponseQueueSize() {
+        return responseQueueSize;
+    }
+
+    public Integer getLoggerQueueSize() {
+        return loggerQueueSize;
+    }
 
 }
diff --git a/wilma-service-api/src/test/java/com/epam/wilma/service/configuration/OperationConfigurationTest.java b/wilma-service-api/src/test/java/com/epam/wilma/service/configuration/OperationConfigurationTest.java
index 2e2a7ebd..faf1bc5f 100644
--- a/wilma-service-api/src/test/java/com/epam/wilma/service/configuration/OperationConfigurationTest.java
+++ b/wilma-service-api/src/test/java/com/epam/wilma/service/configuration/OperationConfigurationTest.java
@@ -53,7 +53,9 @@ public class OperationConfigurationTest {
     private static final String OPERATION_MODE_SETTER_URL_WILMA = "http://host:1/config/admin/switch/wilma";
     private static final String OPERATION_MODE_SETTER_URL_STUB = "http://host:1/config/admin/switch/stub";
     private static final String OPERATION_MODE_SETTER_URL_PROXY = "http://host:1/config/admin/switch/proxy";
-    private static final String JSON_STRING = "{\"proxyMode\":false,\"stubMode\":false,\"wilmaMode\":true}";
+    private static final String JSON_STRING_WILMA_MODE = "{\"proxyMode\":false,\"stubMode\":false,\"wilmaMode\":true}";
+    private static final String JSON_STRING_STUB_MODE = "{\"proxyMode\":false,\"stubMode\":true,\"wilmaMode\":false}";
+    private static final String JSON_STRING_PROXY_MODE = "{\"proxyMode\":true,\"stubMode\":false,\"wilmaMode\":false}";
 
     @Mock
     private WilmaHttpClient client;
@@ -84,12 +86,32 @@ public void shouldReturnNullIfClientReturnsOptionalAbsent() {
     }
 
     @Test
-    public void shouldReturnWithProperValue() {
-        when(client.sendGetterRequest(OPERATION_MODE_STATUS_URL)).thenReturn(Optional.of(JSON_STRING));
+    public void shouldReturnWithProperValueWilma() {
+        when(client.sendGetterRequest(OPERATION_MODE_STATUS_URL)).thenReturn(Optional.of(JSON_STRING_WILMA_MODE));
 
         OperationMode result = operationConfiguration.getOperationMode();
 
-        assertTrue(result == OperationMode.WILMA, "The two JSON objects should be similar.");
+        assertTrue(result == OperationMode.WILMA, "The operation mode should be WILMA.");
+        verify(client, never()).sendSetterRequest(anyString());
+    }
+
+    @Test
+    public void shouldReturnWithProperValueStub() {
+        when(client.sendGetterRequest(OPERATION_MODE_STATUS_URL)).thenReturn(Optional.of(JSON_STRING_STUB_MODE));
+
+        OperationMode result = operationConfiguration.getOperationMode();
+
+        assertTrue(result == OperationMode.STUB, "The operation mode should be STUB.");
+        verify(client, never()).sendSetterRequest(anyString());
+    }
+
+    @Test
+    public void shouldReturnWithProperValueProxy() {
+        when(client.sendGetterRequest(OPERATION_MODE_STATUS_URL)).thenReturn(Optional.of(JSON_STRING_PROXY_MODE));
+
+        OperationMode result = operationConfiguration.getOperationMode();
+
+        assertTrue(result == OperationMode.PROXY, "The operation mode should be PROXY.");
         verify(client, never()).sendSetterRequest(anyString());
     }