diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 859dcb0e0f..142b040d4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: [push, pull_request, workflow_dispatch]
 env:
   DOCKER_CMAKE_FLAGS: -DDOCKER_VERIFY_THREAD=3 -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON \
     -DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON \
-    -DENABLE_ELASTICSEARCH=OFF -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
+    -DENABLE_ELASTICSEARCH=ON -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
   SCCACHE_GHA_ENABLE: true
   CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
 jobs:
diff --git a/PROCESSORS.md b/PROCESSORS.md
index b1ea31cb31..293c317e41 100644
--- a/PROCESSORS.md
+++ b/PROCESSORS.md
@@ -887,7 +887,7 @@ In the list below, the names of required properties appear in bold. Any other pr
 |--------------------------------|---------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **Hostname**                   |               |                  | The ip address or hostname of the destination.<br/>**Supports Expression Language: true**                                                             |
 | **Port**                       | 502           |                  | The port or service on the destination.<br/>**Supports Expression Language: true**                                                                    |
-| **Unit Identifier**            | 0             |                  | The port or service on the destination.<br/>**Supports Expression Language: true**                                                                    |
+| **Unit Identifier**            | 0             |                  | Unit identifier<br/>**Supports Expression Language: true**                                                                                            |
 | **Idle Connection Expiration** | 15 seconds    |                  | The amount of time a connection should be held open without being used before closing the connection. A value of 0 seconds will disable this feature. |
 | **Connection Per FlowFile**    | false         | true<br/>false   | Specifies whether to send each FlowFile's content on an individual connection.                                                                        |
 | **Timeout**                    | 15 seconds    |                  | The timeout for connecting to and communicating with the destination.                                                                                 |
diff --git a/docker/test/integration/features/fetch_modbus_tcp.feature b/docker/test/integration/features/fetch_modbus_tcp.feature
index 6c1eab84e6..0ecb56b103 100644
--- a/docker/test/integration/features/fetch_modbus_tcp.feature
+++ b/docker/test/integration/features/fetch_modbus_tcp.feature
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@MODBUS
+@CORE
 Feature: Minifi C++ can act as a modbus tcp master
 
   Background:
@@ -23,7 +23,7 @@ Feature: Minifi C++ can act as a modbus tcp master
     Given a FetchModbusTcp processor
     And a JsonRecordSetWriter controller service is set up for FetchModbusTcp
     And a PutFile processor with the "Directory" property set to "/tmp/output"
-    And the "Unit identifier" property of the FetchModbusTcp processor is set to "255"
+    And the "Unit Identifier" property of the FetchModbusTcp processor is set to "255"
     And there is an accessible PLC with modbus enabled
     And PLC register has been set with h@52=123 command
     And PLC register has been set with h@5678/f=1.75 command
diff --git a/docker/test/integration/features/opcua.feature b/docker/test/integration/features/opcua.feature
index b75d39b959..e4217a53d5 100644
--- a/docker/test/integration/features/opcua.feature
+++ b/docker/test/integration/features/opcua.feature
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@ENABLE_OPCUA
+@ENABLE_OPC
 Feature: Putting and fetching data to OPC UA server
   In order to send and fetch data from an OPC UA server
   As a user of MiNiFi
diff --git a/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py b/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
index cfb15cfd1e..9708c6cb63 100644
--- a/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
+++ b/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
@@ -21,4 +21,4 @@ class JsonRecordSetWriter(ControllerService):
     def __init__(self, name=None, cert=None, key=None, ca_cert=None, passphrase=None, use_system_cert_store=None):
         super(JsonRecordSetWriter, self).__init__(name=name)
         self.service_class = 'JsonRecordSetWriter'
-        self.properties['Output Grouping'] = 'OneLinePerObject'
+        self.properties['Output Grouping'] = 'One Line Per Object'
diff --git a/extensions/standard-processors/modbus/FetchModbusTcp.h b/extensions/standard-processors/modbus/FetchModbusTcp.h
index 847cb885ac..229bac4111 100644
--- a/extensions/standard-processors/modbus/FetchModbusTcp.h
+++ b/extensions/standard-processors/modbus/FetchModbusTcp.h
@@ -49,9 +49,9 @@ class FetchModbusTcp final : public core::Processor {
       .supportsExpressionLanguage(true)
       .build();
   EXTENSIONAPI static constexpr auto UnitIdentifier = core::PropertyDefinitionBuilder<>::createProperty("Unit Identifier")
-      .withDescription("The port or service on the destination.")
+      .withDescription("Unit identifier")
       .isRequired(true)
-      .withDefaultValue("0")
+      .withDefaultValue("1")
       .supportsExpressionLanguage(true)
       .build();
   EXTENSIONAPI static constexpr auto IdleConnectionExpiration = core::PropertyDefinitionBuilder<>::createProperty("Idle Connection Expiration")