diff --git a/LICENSE.txt b/LICENSE.txt
index 96cf8153..c33953da 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2017, 2023 Oracle Inc (Previously Sun Microsystems Inc)
+Copyright (c) 2023, Oracle and/or its affiliates.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/ConfigurationManagerTest.java b/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/ConfigurationManagerTest.java
index 6d0c59be..1cc0c2bc 100644
--- a/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/ConfigurationManagerTest.java
+++ b/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/ConfigurationManagerTest.java
@@ -114,6 +114,6 @@ public void testMultipleLoading() {
         Configurable c = cm.lookup("default");
         assertNotNull(c);
 
-        assertEquals(12,cm.getComponentNames().size());
+        assertEquals(13,cm.getComponentNames().size());
     }
 }
diff --git a/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/StringMultiwordTest.java b/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/StringMultiwordTest.java
new file mode 100644
index 00000000..089e8bc4
--- /dev/null
+++ b/olcut-core-test/src/test/java/com/oracle/labs/mlrg/olcut/test/config_tests/StringMultiwordTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2004-2023, Oracle and/or its affiliates.
+ *
+ * Licensed under the 2-clause BSD license.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.oracle.labs.mlrg.olcut.test.config_tests;
+
+import com.oracle.labs.mlrg.olcut.config.ConfigurationManager;
+import com.oracle.labs.mlrg.olcut.test.config.StringConfigurable;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static com.oracle.labs.mlrg.olcut.config.ConfigurationManager.createModuleResourceString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class StringMultiwordTest {
+
+    @Test
+    public void multiWord() throws IOException {
+        ConfigurationManager cm = new ConfigurationManager(createModuleResourceString(this.getClass(), "stringConfig.xml"));
+        StringConfigurable sc = (StringConfigurable) cm.lookup(
+                "words");
+        assertEquals("rhesus monkey", sc.one);
+        assertEquals("-Xmx16g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005", sc.two);
+        assertEquals("test/value whitespace", sc.three);
+
+    }
+}
diff --git a/olcut-core-test/src/test/resources/com/oracle/labs/mlrg/olcut/test/config_tests/stringConfig.xml b/olcut-core-test/src/test/resources/com/oracle/labs/mlrg/olcut/test/config_tests/stringConfig.xml
index 6e197937..d9421eba 100644
--- a/olcut-core-test/src/test/resources/com/oracle/labs/mlrg/olcut/test/config_tests/stringConfig.xml
+++ b/olcut-core-test/src/test/resources/com/oracle/labs/mlrg/olcut/test/config_tests/stringConfig.xml
@@ -66,4 +66,10 @@
         <property name="two" value="e"/>
         <property name="three" value="f"/>
     </component>
+
+    <component name="words" type="com.oracle.labs.mlrg.olcut.test.config.StringConfigurable">
+        <property name="one" value="rhesus monkey"/>
+        <property name="two" value="-Xmx16g -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"/>
+        <property name="three" value="test/value whitespace"/>
+    </component>
 </config>
\ No newline at end of file