diff --git a/kura/org.eclipse.kura.wire.component.provider/OSGI-INF/metatype/org.eclipse.kura.wire.CloudPublisher.xml b/kura/org.eclipse.kura.wire.component.provider/OSGI-INF/metatype/org.eclipse.kura.wire.CloudPublisher.xml
index e69dd8aadd6..e7f285f4ff4 100644
--- a/kura/org.eclipse.kura.wire.component.provider/OSGI-INF/metatype/org.eclipse.kura.wire.CloudPublisher.xml
+++ b/kura/org.eclipse.kura.wire.component.provider/OSGI-INF/metatype/org.eclipse.kura.wire.CloudPublisher.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     
-    Copyright (c) 2016, 2020 Eurotech and/or its affiliates and others
+    Copyright (c) 2016, 2023 Eurotech and/or its affiliates and others
   
     This program and the accompanying materials are made
     available under the terms of the Eclipse Public License 2.0
@@ -47,6 +47,15 @@
             default=""
             description="If set to a non empty value, the publisher will set the message body to the value of the provided STRING or BYTE_ARRAY metric.">
         </AD>
+        
+        <AD id="remove.body.from.metrics"
+            name="Remove body envelope property from metrics"
+            type="Boolean"
+            cardinality="0"
+            required="true"
+            default="false"
+            description="Set true to remove the metric that is sent as body of the message.">
+        </AD>
     </OCD>
     
     <Designate pid="org.eclipse.kura.wire.CloudPublisher" factoryPid="org.eclipse.kura.wire.CloudPublisher">
diff --git a/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisher.java b/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisher.java
index 6581b9f1363..5e2d8c873ba 100644
--- a/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisher.java
+++ b/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisher.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2016, 2023 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -60,8 +60,6 @@ public final class CloudPublisher implements WireReceiver, ConfigurableComponent
 
     private static final Logger logger = LogManager.getLogger(CloudPublisher.class);
 
-    private static final String ASSET_NAME_PROPERTY_KEY = "assetName";
-
     private CloudPublisherOptions cloudPublisherOptions;
 
     private volatile WireHelperService wireHelperService;
@@ -235,6 +233,12 @@ private void publishBody(final KuraPayload kuraPayload, final Map<String, TypedV
         } catch (final Exception e) {
             logger.warn("failed to publish body", e);
         }
+
+        boolean isRemoveBodyPropertyFromMetrics = this.cloudPublisherOptions.getRemoveBodyPropertyFromMetrics();
+
+        if (isRemoveBodyPropertyFromMetrics) {
+            kuraPayload.removeMetric(bodyProperty);
+        }
     }
 
     private KuraPosition getPosition() {
@@ -286,6 +290,14 @@ private Map<String, Object> buildKuraMessageProperties(final WireRecord wireReco
         for (String s : l) {
             properties.put(s, wireRecordProps.get(s).getValue());
         }
+
+        Optional<String> bodyProperty = this.cloudPublisherOptions.getBodyProperty();
+        boolean isRemoveBodyPropertyFromMetrics = this.cloudPublisherOptions.getRemoveBodyPropertyFromMetrics();
+
+        if (bodyProperty.isPresent() && isRemoveBodyPropertyFromMetrics) {
+            properties.remove(bodyProperty.get());
+        }
+
         return properties;
     }
 }
diff --git a/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherOptions.java b/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherOptions.java
index 35ff025dcbc..2a90d1fbb30 100644
--- a/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherOptions.java
+++ b/kura/org.eclipse.kura.wire.component.provider/src/main/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherOptions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2016, 2023 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -32,6 +32,7 @@ final class CloudPublisherOptions {
 
     private static final String CONF_POSITION = "publish.position";
     private static final String CONF_BODY_PROPERTY = "set.body.from.property";
+    private static final String CONF_REMOVE_BODY_PROPERTY = "remove.body.from.metrics";
 
     private final Map<String, Object> properties;
 
@@ -82,4 +83,8 @@ Optional<String> getBodyProperty() {
 
         return Optional.of(property);
     }
+
+    boolean getRemoveBodyPropertyFromMetrics() {
+        return (boolean) this.properties.getOrDefault(CONF_REMOVE_BODY_PROPERTY, false);
+    }
 }
\ No newline at end of file
diff --git a/kura/test/org.eclipse.kura.wire.component.provider.test/src/test/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherTest.java b/kura/test/org.eclipse.kura.wire.component.provider.test/src/test/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherTest.java
index 0151991567b..3d2134d466c 100644
--- a/kura/test/org.eclipse.kura.wire.component.provider.test/src/test/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherTest.java
+++ b/kura/test/org.eclipse.kura.wire.component.provider.test/src/test/java/org/eclipse/kura/internal/wire/publisher/CloudPublisherTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 2023 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -15,11 +15,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -54,226 +51,163 @@
 public class CloudPublisherTest {
 
     private static final Logger logger = LoggerFactory.getLogger(CloudPublisherTest.class);
-    
-    public interface FakeCloudPublisher extends org.eclipse.kura.cloudconnection.publisher.CloudPublisher {
-
-        public KuraMessage getMessage();
-    }
 
+    private CloudPublisher cp;
+    private org.eclipse.kura.cloudconnection.publisher.CloudPublisher cloudPublisherMock;
+    private Map<String, Object> properties;
+    private PositionService positionServiceMock;
+    private FakeCloudPublisher fakeCloudPublisher;
+    private Map<String, TypedValue<?>> recordProps;
+    private KuraPayload payload;
+    private KuraPosition position;
+    private KuraMessage kuraMessage;
+    private Map<String, Object> kuraMessageProps;
 
     @Test
     public void testOnWireReceive() throws InvalidSyntaxException, NoSuchFieldException, KuraException {
         // test publishing a normal message with topic replacement
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "none");
+        givenActivatedComponentProperties();
+        givenDefaultRecordProp();
+
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNullBody();
+        thenPayloadHasNullPosition();
+        thenTotalMetricReceived(2);
+        thenCheckDefaultMetricReceived();
+        thenTotalKuraMessagePropsReceived(2);
+        thenCheckDefaultKuraMessageProps();
+    }
 
-        String topic = "my test topic";
-
-        CloudPublisher cp = new CloudPublisher();
-
-        WireHelperService wireHelperServiceMock = mock(WireHelperService.class);
-        cp.bindWireHelperService(wireHelperServiceMock);
-
-        BundleContext bundleCtxMock = mock(BundleContext.class);
-        Filter filter = mock(Filter.class);
-        when(bundleCtxMock.createFilter(anyString())).thenReturn(filter);
-
-        ComponentContext ctxMock = mock(ComponentContext.class);
-        when(ctxMock.getBundleContext()).thenReturn(bundleCtxMock);
-
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("CloudPublisher.target", "cspid");
-        properties.put("publish.position", "none");
-
-        cp.activate(ctxMock, properties);
-
-        org.eclipse.kura.cloudconnection.publisher.CloudPublisher cloudPublisherMock = mock(
-                org.eclipse.kura.cloudconnection.publisher.CloudPublisher.class);
-
-        when(cloudPublisherMock.publish((KuraMessage) any())).thenAnswer(invocation -> {
-            KuraMessage message = invocation.getArgument(1, KuraMessage.class);
-
-            KuraPayload payload = message.getPayload();
-
-            assertNull(payload.getBody());
-            assertNull(payload.getPosition());
-            assertNotNull(payload.getTimestamp());
-            assertNotNull(payload.metrics());
-            assertEquals(2, payload.metrics().size());
-            assertEquals("val", payload.getMetric("key"));
-            assertEquals(topic, payload.getMetric("topic"));
-
-            return 1234;
-        });
-
-        TestUtil.setFieldValue(cp, "cloudConnectionPublisher", cloudPublisherMock);
-
-        String emitterPid = "emitter";
-        List<WireRecord> wireRecords = new ArrayList<>();
-        Map<String, TypedValue<?>> recordProps = new HashMap<>();
-        TypedValue<?> val = new StringValue("val");
-        recordProps.put("key", val);
-        val = new StringValue(topic);
-        recordProps.put("topic", val);
-        WireRecord record = new WireRecord(recordProps);
-        wireRecords.add(record);
-        WireEnvelope wireEnvelope = new WireEnvelope(emitterPid, wireRecords);
-
-        cp.onWireReceive(wireEnvelope);
+    @Test
+    public void testOnWireReceiveSetBody() throws InvalidSyntaxException, NoSuchFieldException, KuraException {
+        // test publishing a normal message with topic replacement
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "none");
+        givenBodyProperties("key", Boolean.FALSE);
+        givenActivatedComponentProperties();
+        givenDefaultRecordProp();
+
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNotNullBody();
+        thenPayloadHasNullPosition();
+        thenTotalMetricReceived(2);
+        thenCheckDefaultMetricReceived();
+        thenTotalKuraMessagePropsReceived(2);
+        thenCheckDefaultKuraMessageProps();
+    }
 
-        verify(cloudPublisherMock, times(1)).publish((KuraMessage) any());
+    @Test
+    public void testOnWireReceiveSetBodyRemoveFromMetrics()
+            throws InvalidSyntaxException, NoSuchFieldException, KuraException {
+        // test publishing a normal message with topic replacement
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "none");
+        givenBodyProperties("key", Boolean.TRUE);
+        givenActivatedComponentProperties();
+        givenDefaultRecordProp();
+
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNotNullBody();
+        thenPayloadHasNullPosition();
+        thenTotalMetricReceived(1);
+        thenCheckOneMetricReceived();
+        thenTotalKuraMessagePropsReceived(1);
+        thenCheckOneKuraMessagePropsReceived();
     }
 
     @Test
     public void testOnWireReceiveWithBasicPosition()
             throws InvalidSyntaxException, NoSuchFieldException, KuraException {
         // test publishing a normal message with topic replacement and position
-        String positionType = "basic";
-        String topic = "my test topic";
-
-        CloudPublisher cp = new CloudPublisher();
-
-        WireHelperService wireHelperServiceMock = mock(WireHelperService.class);
-        cp.bindWireHelperService(wireHelperServiceMock);
-
-        BundleContext bundleCtxMock = mock(BundleContext.class);
-        Filter filter = mock(Filter.class);
-        when(bundleCtxMock.createFilter(anyString())).thenReturn(filter);
-
-        ComponentContext ctxMock = mock(ComponentContext.class);
-        when(ctxMock.getBundleContext()).thenReturn(bundleCtxMock);
-
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("CloudPublisher.target", "cspid");
-        properties.put("publish.position", positionType);
-
-        cp.activate(ctxMock, properties);
-
-        org.eclipse.kura.cloudconnection.publisher.CloudPublisher cloudPublisherMock = mock(
-                org.eclipse.kura.cloudconnection.publisher.CloudPublisher.class);
-
-        PositionService positionServiceMock = mock(PositionService.class);
-
-        when(positionServiceMock.getNmeaPosition()).thenReturn(new NmeaPosition(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-
-        when(cloudPublisherMock.publish((KuraMessage) any())).thenAnswer(invocation -> {
-            KuraMessage message = invocation.getArgument(1, KuraMessage.class);
-
-            KuraPayload payload = message.getPayload();
-            KuraPosition position = payload.getPosition();
-
-            assertNull(payload.getBody());
-            assertNotNull(position);
-            assertNotNull(position.getAltitude());
-            assertNotNull(position.getLatitude());
-            assertNotNull(position.getLongitude());
-            assertNull(position.getSatellites());
-            assertNotNull(payload.getTimestamp());
-            assertNotNull(payload.metrics());
-            assertEquals(2, payload.metrics().size());
-            assertEquals("val", payload.getMetric("key"));
-            assertEquals(topic, payload.getMetric("topic"));
-
-            return 1234;
-        });
-
-        TestUtil.setFieldValue(cp, "cloudConnectionPublisher", cloudPublisherMock);
-        TestUtil.setFieldValue(cp, "positionService", positionServiceMock);
-
-        String emitterPid = "emitter";
-        List<WireRecord> wireRecords = new ArrayList<>();
-        Map<String, TypedValue<?>> recordProps = new HashMap<>();
-        TypedValue<?> val = new StringValue("val");
-        recordProps.put("key", val);
-        val = new StringValue(topic);
-        recordProps.put("topic", val);
-        WireRecord record = new WireRecord(recordProps);
-        wireRecords.add(record);
-        WireEnvelope wireEnvelope = new WireEnvelope(emitterPid, wireRecords);
-
-        cp.onWireReceive(wireEnvelope);
-
-        verify(cloudPublisherMock, times(1)).publish((KuraMessage) any());
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "basic");
+        givenActivatedComponentProperties();
+        givenPositionServiceMock();
+        givenDefaultRecordProp();
+
+        whenSetPositionServiceMock();
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNullBody();
+        thenCheckBasicPosition();
+        thenTotalMetricReceived(2);
+        thenCheckDefaultMetricReceived();
+        thenTotalKuraMessagePropsReceived(2);
+        thenCheckDefaultKuraMessageProps();
     }
 
     @Test
     public void testOnWireReceiveWithFullPosition() throws InvalidSyntaxException, NoSuchFieldException, KuraException {
         // test publishing a normal message with topic replacement and position
-
-        String positionType = "full";
-        String topic = "my test topic";
-
-        CloudPublisher cp = new CloudPublisher();
-
-        WireHelperService wireHelperServiceMock = mock(WireHelperService.class);
-        cp.bindWireHelperService(wireHelperServiceMock);
-
-        BundleContext bundleCtxMock = mock(BundleContext.class);
-        Filter filter = mock(Filter.class);
-        when(bundleCtxMock.createFilter(anyString())).thenReturn(filter);
-
-        ComponentContext ctxMock = mock(ComponentContext.class);
-        when(ctxMock.getBundleContext()).thenReturn(bundleCtxMock);
-
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("CloudPublisher.target", "cspid");
-        properties.put("publish.position", positionType);
-
-        cp.activate(ctxMock, properties);
-
-        org.eclipse.kura.cloudconnection.publisher.CloudPublisher cloudPublisherMock = mock(
-                org.eclipse.kura.cloudconnection.publisher.CloudPublisher.class);
-
-        PositionService positionServiceMock = mock(PositionService.class);
-
-        when(positionServiceMock.getNmeaPosition()).thenReturn(new NmeaPosition(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-
-        when(cloudPublisherMock.publish((KuraMessage) any())).thenAnswer(invocation -> {
-            KuraMessage message = invocation.getArgument(1, KuraMessage.class);
-
-            KuraPayload payload = message.getPayload();
-            KuraPosition position = payload.getPosition();
-
-            assertNull(payload.getBody());
-            assertNotNull(position);
-            assertNotNull(position.getAltitude());
-            assertNotNull(position.getLatitude());
-            assertNotNull(position.getLongitude());
-            assertNotNull(position.getHeading());
-            assertNotNull(position.getPrecision());
-            assertNotNull(position.getSpeed());
-            assertNotNull(position.getSatellites());
-            assertNotNull(payload.getTimestamp());
-            assertNotNull(payload.metrics());
-            assertEquals(2, payload.metrics().size());
-            assertEquals("val", payload.getMetric("key"));
-            assertEquals(topic, payload.getMetric("topic"));
-
-            return 1234;
-        });
-
-        TestUtil.setFieldValue(cp, "cloudConnectionPublisher", cloudPublisherMock);
-        TestUtil.setFieldValue(cp, "positionService", positionServiceMock);
-
-        String emitterPid = "emitter";
-        List<WireRecord> wireRecords = new ArrayList<>();
-        Map<String, TypedValue<?>> recordProps = new HashMap<>();
-        TypedValue<?> val = new StringValue("val");
-        recordProps.put("key", val);
-        val = new StringValue(topic);
-        recordProps.put("topic", val);
-        WireRecord record = new WireRecord(recordProps);
-        wireRecords.add(record);
-        WireEnvelope wireEnvelope = new WireEnvelope(emitterPid, wireRecords);
-
-        cp.onWireReceive(wireEnvelope);
-
-        verify(cloudPublisherMock, times(1)).publish((KuraMessage) any());
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "full");
+        givenActivatedComponentProperties();
+        givenPositionServiceMock();
+        givenDefaultRecordProp();
+
+        whenSetPositionServiceMock();
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNullBody();
+        thenCheckFullPosition();
+        thenTotalMetricReceived(2);
+        thenCheckDefaultMetricReceived();
+        thenTotalKuraMessagePropsReceived(2);
+        thenCheckDefaultKuraMessageProps();
     }
-    
+
     @Test
     public void testTopicReplacementOnWireReceive() throws InvalidSyntaxException, NoSuchFieldException, KuraException {
         // test publishing a normal message with topic replacement
+        givenCloudPublisher();
+        givenDefaultProperties();
+        givenUpdatedProperties("publish.position", "none");
+        givenUpdatedProperties("app.topic", "$assetName/$test");
+        givenActivatedComponentProperties();
+        givenDefaultRecordProp();
+        givenAddedRecordProp("assetName", "testAsset");
+        givenAddedRecordProp("test", "replaceTest");
+
+        whenOnWireReceive();
+        whenKuraMessageReceived();
+
+        thenPayloadHasNullBody();
+        thenPayloadHasNullPosition();
+        thenTotalMetricReceived(4);
+        thenCheckDefaultMetricReceived();
+        thenCheckSemanticTopic();
+        thenTotalKuraMessagePropsReceived(4);
+        thenCheckDefaultKuraMessageProps();
+    }
 
-        FakeCloudPublisher fakeCloudPublisher = new FakeCloudPublisher() {
+    /*
+     * Steps
+     */
+
+    /*
+     * Given steps
+     */
+
+    private void givenCloudPublisher() {
+        this.cp = new CloudPublisher();
+        WireHelperService wireHelperServiceMock = mock(WireHelperService.class);
+        this.cp.bindWireHelperService(wireHelperServiceMock);
+        this.fakeCloudPublisher = new FakeCloudPublisher() {
 
             private KuraMessage kmessage = new KuraMessage(null);
 
@@ -312,63 +246,159 @@ public KuraMessage getMessage() {
                 return kmessage;
             }
         };
+    }
 
-        String topic = "my test topic";
+    private void givenDefaultProperties() throws InvalidSyntaxException {
+        this.properties = new HashMap<>();
+        this.properties.put("CloudPublisher.target", "cspid");
+    }
 
-        CloudPublisher cp = new CloudPublisher();
+    private void givenUpdatedProperties(String key, String value) {
+        this.properties.put(key, value);
+    }
 
-        WireHelperService wireHelperServiceMock = mock(WireHelperService.class);
-        cp.bindWireHelperService(wireHelperServiceMock);
+    private void givenBodyProperties(String setBodyFromProperty, Boolean removeBodyFromMetrics) {
+        this.properties.put("set.body.from.property", setBodyFromProperty);
+        this.properties.put("remove.body.from.metrics", removeBodyFromMetrics);
+    }
 
+    private void givenActivatedComponentProperties() throws InvalidSyntaxException {
         BundleContext bundleCtxMock = mock(BundleContext.class);
         Filter filter = mock(Filter.class);
         when(bundleCtxMock.createFilter(anyString())).thenReturn(filter);
-
         ComponentContext ctxMock = mock(ComponentContext.class);
         when(ctxMock.getBundleContext()).thenReturn(bundleCtxMock);
+        this.cp.activate(ctxMock, this.properties);
+        this.cp.setCloudPublisher(this.fakeCloudPublisher);
+    }
+
+    private void givenPositionServiceMock() {
+        this.positionServiceMock = mock(PositionService.class);
+    }
+
+    private void givenFakeCloudPublisher() {
+
+    }
+
+    private void givenSetFakeCloudPublisher() {
+
+    }
+
+    private void givenDefaultRecordProp() {
+        this.recordProps = new HashMap<>();
+        this.recordProps.put("key", new StringValue("val"));
+        this.recordProps.put("topic", new StringValue("my test topic"));
+    }
 
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("CloudPublisher.target", "cspid");
-        properties.put("publish.position", "none");
-        properties.put("app.topic", "$assetName/$test");
+    private void givenAddedRecordProp(String key, String stringValue) {
+        this.recordProps.put(key, new StringValue(stringValue));
+    }
 
-        cp.activate(ctxMock, properties);
-        cp.setCloudPublisher(fakeCloudPublisher);
+    /*
+     * When
+     */
 
-        String emitterPid = "emitter";
+    private void whenOnWireReceive() {
         List<WireRecord> wireRecords = new ArrayList<>();
-        Map<String, TypedValue<?>> recordProps = new HashMap<>();
-        TypedValue<?> val = new StringValue("val");
-        recordProps.put("key", val);
-        val = new StringValue(topic);
-        recordProps.put("topic", val);
-        recordProps.put("assetName", new StringValue("testAsset"));
-        recordProps.put("test", new StringValue("replaceTest"));
-        WireRecord record = new WireRecord(recordProps);
+
+        WireRecord record = new WireRecord(this.recordProps);
         wireRecords.add(record);
-        WireEnvelope wireEnvelope = new WireEnvelope(emitterPid, wireRecords);
-        cp.onWireReceive(wireEnvelope);
 
-        KuraMessage km = fakeCloudPublisher.getMessage();
-        Map<String, Object> messageProps = km.getProperties();
-        for (String key : messageProps.keySet()) {
-            logger.info("{} -> {}", key, messageProps.get(key));
-        }
-        KuraPayload payload = km.getPayload();
+        WireEnvelope wireEnvelope = new WireEnvelope("emitter", wireRecords);
+        this.cp.onWireReceive(wireEnvelope);
+    }
+
+    private void whenSetPositionServiceMock() throws NoSuchFieldException {
+        when(this.positionServiceMock.getNmeaPosition())
+                .thenReturn(new NmeaPosition(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+        TestUtil.setFieldValue(this.cp, "positionService", this.positionServiceMock);
+    }
+
+    private void whenKuraMessageReceived() {
+        this.kuraMessage = this.fakeCloudPublisher.getMessage();
+        this.kuraMessageProps = this.kuraMessage.getProperties();
+        this.payload = this.kuraMessage.getPayload();
+        this.position = this.payload.getPosition();
+    }
 
-        assertNull(payload.getBody());
-        assertNull(payload.getPosition());
-        assertNotNull(payload.getTimestamp());
-        assertNotNull(payload.metrics());
-        assertEquals(4, payload.metrics().size());
-        assertEquals("val", payload.getMetric("key"));
-        assertEquals(topic, payload.getMetric("topic"));
+    /*
+     * Then
+     */
 
-        String appTopic = fillAppTopicPlaceholders("$assetName/$test", km);
+    private void thenPayloadHasNullBody() {
+        assertNull(this.payload.getBody());
+    }
+
+    private void thenPayloadHasNotNullBody() {
+        assertNotNull(this.payload.getBody());
+        byte[] body = this.payload.getBody();
+        // byte[] decodedBody = Base64.getDecoder().decode(body);
+        String stringBody = new String(body);
+        assertEquals("val", stringBody);
+    }
+
+    private void thenPayloadHasNullPosition() {
+        assertNull(this.payload.getPosition());
+    }
+
+    private void thenTotalMetricReceived(int numMetrics) {
+        assertNotNull(this.payload.getTimestamp());
+        assertNotNull(this.payload.metrics());
+        assertEquals(numMetrics, this.payload.metrics().size());
+    }
+
+    private void thenCheckDefaultMetricReceived() {
+        assertEquals("val", this.payload.getMetric("key"));
+        assertEquals("my test topic", this.payload.getMetric("topic"));
+    }
+
+    private void thenCheckOneMetricReceived() {
+        assertEquals("my test topic", this.payload.getMetric("topic"));
+    }
+
+    private void thenTotalKuraMessagePropsReceived(int numMetrics) {
+        assertNotNull(this.kuraMessageProps);
+        assertEquals(numMetrics, this.kuraMessageProps.size());
+    }
+
+    private void thenCheckDefaultKuraMessageProps() {
+        assertEquals("val", this.kuraMessageProps.get("key"));
+        assertEquals("my test topic", this.kuraMessageProps.get("topic"));
+    }
+
+    private void thenCheckOneKuraMessagePropsReceived() {
+        assertEquals("my test topic", this.kuraMessageProps.get("topic"));
+    }
+
+    private void thenCheckSemanticTopic() {
+        String appTopic = fillAppTopicPlaceholders("$assetName/$test", this.kuraMessage);
         assertEquals("testAsset/replaceTest", appTopic);
-        
-        logger.info("appTopic = {}",appTopic);
+    }
+
+    private void thenCheckBasicPosition() {
+        assertNotNull(this.position);
+        assertNotNull(this.position.getAltitude());
+        assertNotNull(this.position.getLatitude());
+        assertNotNull(this.position.getLongitude());
+        assertNull(this.position.getSatellites());
+    }
+
+    private void thenCheckFullPosition() {
+        assertNotNull(this.position.getAltitude());
+        assertNotNull(this.position.getLatitude());
+        assertNotNull(this.position.getLongitude());
+        assertNotNull(this.position.getHeading());
+        assertNotNull(this.position.getPrecision());
+        assertNotNull(this.position.getSpeed());
+        assertNotNull(this.position.getSatellites());
+    }
+    /*
+     * Utilities
+     */
+
+    public interface FakeCloudPublisher extends org.eclipse.kura.cloudconnection.publisher.CloudPublisher {
 
+        public KuraMessage getMessage();
     }
 
     private String fillAppTopicPlaceholders(String appTopic, KuraMessage message) {