diff --git a/src/test/java/SplunkCimLogEventUnitTest.java b/src/test/java/SplunkCimLogEventUnitTest.java
index 35407ec8..8daf78e8 100644
--- a/src/test/java/SplunkCimLogEventUnitTest.java
+++ b/src/test/java/SplunkCimLogEventUnitTest.java
@@ -30,7 +30,7 @@ public void addFieldWithCharValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", '\u4126');
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=\u4126\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"\u4126\"", event.toString());
     }
 
     @Test
@@ -38,7 +38,7 @@ public void addFieldWithByteValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (byte)125);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=125\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"125\"", event.toString());
     }
 
     @Test
@@ -46,7 +46,7 @@ public void addFieldWithShortValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (short)129);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=129\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"129\"", event.toString());
     }
 
     @Test
@@ -54,7 +54,7 @@ public void addFieldWithIntValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (int)129);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=129\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"129\"", event.toString());
     }
 
     @Test
@@ -62,7 +62,7 @@ public void addFieldWithLongValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (long)129L);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=129\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"129\"", event.toString());
     }
 
     @Test
@@ -70,7 +70,7 @@ public void addFieldWithFloatValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (float)129.32);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=129.32\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"129.32\"", event.toString());
     }
 
     @Test
@@ -78,7 +78,7 @@ public void addFieldWithDoubleValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", (double)129.32);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=129.32\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"129.32\"", event.toString());
     }
 
     @Test
@@ -86,7 +86,7 @@ public void addFieldWithBooleanValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", true);
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=true\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"true\"", event.toString());
     }
 
     @Test
@@ -94,7 +94,7 @@ public void addFieldWithStringValue() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", "some \u4406\u4261");
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=some \u4406\u4261\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"some \u4406\u4261\"", event.toString());
     }
 
     @Test
@@ -107,7 +107,7 @@ public String toString() {
             }
         });
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=" + valueString + "\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"" + valueString + "\"", event.toString());
     }
 
     @Test
@@ -115,7 +115,7 @@ public void addFieldWithStringValueContainingDoubleQuotes() {
         SplunkCimLogEvent event = new SplunkCimLogEvent("name", "event-id");
         event.addField("key", "I contain \" double quotes");
 
-        Assert.assertEquals("\"name=name\" \"event_id=event-id\" \"key=I contain \\\" double quotes\"", event.toString());
+        Assert.assertEquals("name=\"name\" event_id=\"event-id\" key=\"I contain \\\" double quotes\"", event.toString());
     }
 
     @Test
@@ -128,9 +128,9 @@ public void addThrowableWorks() {
             event.addThrowableWithStacktrace(e);
         }
 
-        String expectedString = "\"name=name\" \"event_id=event-id\" " +
-                "\"throwable_class=java.lang.Exception\" \"throwable_message=This is a test of the Java " +
-                "emergency broadcast system.\" \"stacktrace_elements=SplunkCimLogEventUnitTest." +
+        String expectedString = "name=\"name\" event_id=\"event-id\" " +
+                "throwable_class=\"java.lang.Exception\" throwable_message=\"This is a test of the Java " +
+                "emergency broadcast system.\" stacktrace_elements=\"SplunkCimLogEventUnitTest." +
                 "addThrowableWorks(SplunkCimLogEventUnitTest.java:???),";
         String foundString = event.toString();
         foundString = foundString.replaceAll(":\\d+\\)", ":???)"); // Get rid of line numbers.
@@ -149,9 +149,9 @@ public void addThrowableWorksWithDepth() {
             event.addThrowableWithStacktrace(e, 1);
         }
 
-        String expected = "\"name=name\" \"event_id=event-id\" " +
-                "\"throwable_class=java.lang.Exception\" \"throwable_message=This is a test of the Java " +
-                "emergency broadcast system.\" \"stacktrace_elements=SplunkCimLogEventUnitTest." +
+        String expected = "name=\"name\" event_id=\"event-id\" " +
+                "throwable_class=\"java.lang.Exception\" throwable_message=\"This is a test of the Java " +
+                "emergency broadcast system.\" stacktrace_elements=\"SplunkCimLogEventUnitTest." +
                 "addThrowableWorksWithDepth(SplunkCimLogEventUnitTest.java:???)\"";
         Assert.assertEquals(expected, event.toString().replaceAll(":\\d+\\)", ":???)"));
     }