diff --git a/src/vnsw/agent/pkt/test/test_flow_base.cc b/src/vnsw/agent/pkt/test/test_flow_base.cc
index 62adb719293..bb853b78c28 100644
--- a/src/vnsw/agent/pkt/test/test_flow_base.cc
+++ b/src/vnsw/agent/pkt/test/test_flow_base.cc
@@ -339,50 +339,46 @@ class FlowTest : public ::testing::Test {
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
                 "                        <src-address>\n"
-                "                            <virtual-network> any </virtual-network>\n"
+                "                            <virtual-network>any</virtual-network>\n"
                 "                        </src-address>\n"
                 "                        <protocol>%d</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </src-port>\n"
                 "                        <dst-address>\n"
-                "                            <virtual-network> any </virtual-network>\n"
+                "                            <virtual-network>any</virtual-network>\n"
                 "                        </dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            %s\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>%s</simple-action>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>%s</rule-uuid>\n"
                 "                </acl-rule>\n"
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
                 "                        <src-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </src-address>\n"
                 "                        <protocol>any</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </src-port>\n"
                 "                        <dst-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            deny\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>deny</simple-action>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>fe6a4dcb-dde4-48e6-8957-856a7aacb2e1</rule-uuid>\n"
                 "                </acl-rule>\n"
@@ -431,49 +427,43 @@ class FlowTest : public ::testing::Test {
                 "                <dynamic>false</dynamic>\n"
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
-                "                        <src-address> %s \n"
-                "                        </src-address>\n"
+                "                        <src-address>%s</src-address>\n"
                 "                        <protocol>%d</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </src-port>\n"
-                "                        <dst-address> %s \n"
-                "                        </dst-address>\n"
+                "                        <dst-address>%s</dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            %s\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>%s</simple-action>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>%s</rule-uuid>\n"
                 "                </acl-rule>\n"
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
                 "                        <src-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </src-address>\n"
                 "                        <protocol>any</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </src-port>\n"
                 "                        <dst-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            deny\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>deny</simple-action>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>\n"
                 "                        fe6a4dcb-dde4-48e6-8957-856a7aacb2e1\n"
@@ -528,25 +518,23 @@ class FlowTest : public ::testing::Test {
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
                 "                        <src-address>\n"
-                "                            <virtual-network> any </virtual-network>\n"
+                "                            <virtual-network>any</virtual-network>\n"
                 "                        </src-address>\n"
                 "                        <protocol>%d</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </src-port>\n"
                 "                        <dst-address>\n"
-                "                            <virtual-network> any </virtual-network>\n"
+                "                            <virtual-network>any</virtual-network>\n"
                 "                        </dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 10000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>10000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            %s\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>%s</simple-action>\n"
                 "                        <log>%s</log>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>%s</rule-uuid>\n"
@@ -554,25 +542,23 @@ class FlowTest : public ::testing::Test {
                 "                <acl-rule>\n"
                 "                    <match-condition>\n"
                 "                        <src-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </src-address>\n"
                 "                        <protocol>any</protocol>\n"
                 "                        <src-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </src-port>\n"
                 "                        <dst-address>\n"
-                "                            <virtual-network> vn6 </virtual-network>\n"
+                "                            <virtual-network>vn6</virtual-network>\n"
                 "                        </dst-address>\n"
                 "                        <dst-port>\n"
-                "                            <start-port> 0 </start-port>\n"
-                "                            <end-port> 60000 </end-port>\n"
+                "                            <start-port>0</start-port>\n"
+                "                            <end-port>60000</end-port>\n"
                 "                        </dst-port>\n"
                 "                    </match-condition>\n"
                 "                    <action-list>\n"
-                "                        <simple-action>\n"
-                "                            deny\n"
-                "                        </simple-action>\n"
+                "                        <simple-action>deny</simple-action>\n"
                 "                    </action-list>\n"
                 "                    <rule-uuid>fe6a4dcb-dde4-48e6-8957-856a7aacb2e1</rule-uuid>\n"
                 "                </acl-rule>\n"
diff --git a/src/vnsw/agent/pkt/test/test_sg_flowv6.cc b/src/vnsw/agent/pkt/test/test_sg_flowv6.cc
index 80a754990a1..fef630bd98c 100644
--- a/src/vnsw/agent/pkt/test/test_sg_flowv6.cc
+++ b/src/vnsw/agent/pkt/test/test_sg_flowv6.cc
@@ -72,8 +72,8 @@ static string AddAclXmlString(const char *node_name, const char *name, int id,
     "                        </src-address>\n"
     "                        <protocol>%d</protocol>\n"
     "                        <src-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </src-port>\n"
     "                        <dst-address>\n"
     "                            <subnet>\n"
@@ -82,14 +82,12 @@ static string AddAclXmlString(const char *node_name, const char *name, int id,
     "                            </subnet>\n"
     "                        </dst-address>\n"
     "                        <dst-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </dst-port>\n"
     "                    </match-condition>\n"
     "                    <action-list>\n"
-    "                        <simple-action>\n"
-    "                            %s\n"
-    "                        </simple-action>\n"
+    "                        <simple-action>%s</simple-action>\n"
     "                    </action-list>\n"
     "                </acl-rule>\n"
     "           </access-control-list-entries>\n"
@@ -114,6 +112,7 @@ static void AddAclEntry(const char *name, int id, int proto,
     std::string s = AddAclXmlString("access-control-list", acl_name, id, proto,
                                     action, sip, dip);
     pugi::xml_document xdoc_;
+    cout << s << endl;
     pugi::xml_parse_result result = xdoc_.load(s.c_str());
     EXPECT_TRUE(result);
     Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0);
@@ -147,51 +146,47 @@ static string AddSgIdAclXmlString(const char *node_name, const char *name, int i
     "                <acl-rule>\n"
     "                    <match-condition>\n"
     "                        <src-address>\n"
-    "                            <security-group> %d </security-group>\n"
+    "                            <security-group>%d</security-group>\n"
     "                        </src-address>\n"
     "                        <protocol>%d</protocol>\n"
     "                        <src-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </src-port>\n"
     "                        <dst-address>\n"
-    "                            <security-group> %d </security-group>\n"
+    "                            <security-group>%d</security-group>\n"
     "                        </dst-address>\n"
     "                        <dst-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </dst-port>\n"
     "                        <ethertype>IPv6</ethertype>\n"
     "                    </match-condition>\n"
     "                    <action-list>\n"
-    "                        <simple-action>\n"
-    "                            %s\n"
-    "                        </simple-action>\n"
+    "                        <simple-action>%s</simple-action>\n"
     "                    </action-list>\n"
     "                </acl-rule>\n"
     "                <acl-rule>\n"
     "                    <match-condition>\n"
     "                        <src-address>\n"
-    "                            <security-group> %d </security-group>\n"
+    "                            <security-group>%d</security-group>\n"
     "                        </src-address>\n"
     "                        <protocol>%d</protocol>\n"
     "                        <src-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </src-port>\n"
     "                        <dst-address>\n"
-    "                            <security-group> %d </security-group>\n"
+    "                            <security-group>%d</security-group>\n"
     "                        </dst-address>\n"
     "                        <dst-port>\n"
-    "                            <start-port> 0 </start-port>\n"
-    "                            <end-port> 10000 </end-port>\n"
+    "                            <start-port>0</start-port>\n"
+    "                            <end-port>10000</end-port>\n"
     "                        </dst-port>\n"
     "                        <ethertype>IPv6</ethertype>\n"
     "                    </match-condition>\n"
     "                    <action-list>\n"
-    "                        <simple-action>\n"
-    "                            %s\n"
-    "                        </simple-action>\n"
+    "                        <simple-action>%s</simple-action>\n"
     "                    </action-list>\n"
     "                </acl-rule>\n"
     "           </access-control-list-entries>\n"
diff --git a/src/vnsw/agent/test/test_util.cc b/src/vnsw/agent/test/test_util.cc
index ba97ec5f2ed..69d4b403216 100644
--- a/src/vnsw/agent/test/test_util.cc
+++ b/src/vnsw/agent/test/test_util.cc
@@ -1851,8 +1851,8 @@ void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *rt,
 
     for (int i = 0; i < count; i++) {
         o_str << "<route>\n"
-              << "<prefix>\n" << rt->addr_.to_string()
-              << "/" << rt->plen_ << " \n"  << "</prefix>\n"
+              << "<prefix>" << rt->addr_.to_string()
+              << "/" << rt->plen_ << "</prefix>\n"
               << "<next-hop>\" \"</next-hop>\n"
               << "<next-hop-type>\" \"</next-hop-type>\n"
               << "</route>\n";
@@ -1872,8 +1872,8 @@ void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *rt,
 
     for (int i = 0; i < count; i++) {
         o_str << "<route>\n"
-              << "<prefix>\n" << rt->addr_.to_string()
-              << "/" << rt->plen_ << " \n"  << "</prefix>\n"
+              << "<prefix>" << rt->addr_.to_string()
+              << "/" << rt->plen_ << "</prefix>\n"
               << "<next-hop>" << nexthop << "</next-hop>\n"
               << "<next-hop-type>\" \"</next-hop-type>\n"
               << "</route>\n";
@@ -1894,8 +1894,8 @@ void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *rt,
 
     for (int i = 0; i < count; i++) {
         o_str << "<route>\n"
-              << "<prefix>\n" << rt->addr_.to_string()
-              << "/" << rt->plen_ << " \n"  << "</prefix>\n";
+              << "<prefix>" << rt->addr_.to_string()
+              << "/" << rt->plen_ << "</prefix>\n";
         if (nexthop) {
             o_str << "<next-hop>" << nexthop << "</next-hop>\n";
         }
@@ -1924,8 +1924,8 @@ void AddInterfaceRouteTableV6(const char *name, int id, TestIp6Prefix *rt,
 
     for (int i = 0; i < count; i++) {
         o_str << "<route>\n"
-              << "<prefix>\n" << rt->addr_.to_string()
-              << "/" << rt->plen_ << " \n"  << "</prefix>\n"
+              << "<prefix>" << rt->addr_.to_string()
+              << "/" << rt->plen_ << "</prefix>\n"
               << "<next-hop>\" \"</next-hop>\n"
               << "<next-hop-type>\" \"</next-hop-type>\n"
               << "</route>\n";
@@ -1990,7 +1990,7 @@ void AddAceEntry(string *str, const char *src_vn, const char *dst_vn,
 
     if (mirror_ip != "") {
         mirror << "<mirror-to>";
-        mirror << "<analyzer-name> mirror-1 </analyzer-name>";
+        mirror << "<analyzer-name>mirror-1</analyzer-name>";
         mirror << "<analyzer-ip-address>" << mirror_ip << "</analyzer-ip-address>";
         mirror << "<routing-instance>" << "" << "</routing-instance>";
         mirror << "<udp-port>" << "8159" << "</udp-port>";
@@ -2002,27 +2002,27 @@ void AddAceEntry(string *str, const char *src_vn, const char *dst_vn,
     sprintf(buff,
             "                <acl-rule>\n"
             "                    <match-condition>\n"
-            "                        <protocol> %s </protocol>\n"
+            "                        <protocol>%s</protocol>\n"
             "                        <src-address>\n"
-            "                            <virtual-network> %s </virtual-network>\n"
+            "                            <virtual-network>%s</virtual-network>\n"
             "                        </src-address>\n"
             "                        <src-port>\n"
-            "                            <start-port> %d </start-port>\n"
-            "                            <end-port> %d </end-port>\n"
+            "                            <start-port>%d</start-port>\n"
+            "                            <end-port>%d</end-port>\n"
             "                        </src-port>\n"
             "                        <dst-address>\n"
-            "                            <virtual-network> %s </virtual-network>\n"
+            "                            <virtual-network>%s</virtual-network>\n"
             "                        </dst-address>\n"
             "                        <dst-port>\n"
-            "                            <start-port> %d </start-port>\n"
-            "                            <end-port> %d </end-port>\n"
+            "                            <start-port>%d</start-port>\n"
+            "                            <end-port>%d</end-port>\n"
             "                        </dst-port>\n"
             "                    </match-condition>\n"
             "                    <action-list>\n"
-            "                        <simple-action> %s </simple-action>\n"
+            "                        <simple-action>%s</simple-action>\n"
             "                        %s\n"
-            "                        <assign-routing-instance> %s </assign-routing-instance>\n"
-            "                        <qos-action> %s </qos-action>\n"
+            "                        <assign-routing-instance>%s</assign-routing-instance>\n"
+            "                        <qos-action>%s</qos-action>\n"
             "                    </action-list>\n"
             "                </acl-rule>\n",
         proto, src_vn, sport_start, sport_end, dst_vn, dport_start, dport_end,
diff --git a/src/vnsw/agent/test/test_vn.cc b/src/vnsw/agent/test/test_vn.cc
index a2c278cf202..19c2c7c1386 100644
--- a/src/vnsw/agent/test/test_vn.cc
+++ b/src/vnsw/agent/test/test_vn.cc
@@ -984,11 +984,11 @@ TEST_F(CfgTest, flat_subnet_config) {
                        "<ipam-subnets>\n "
                            "<subnets>\n "
                                "<subnet>\n "
-                                   "<ip-prefix> 12.1.0.0 </ip-prefix>\n "
-                                   "<ip-prefix-len> 16 </ip-prefix-len>\n "
+                                   "<ip-prefix>12.1.0.0</ip-prefix>\n "
+                                   "<ip-prefix-len>16</ip-prefix-len>\n "
                                "</subnet>\n "
-                               "<default-gateway> 12.1.0.1 </default-gateway>\n "
-                               "<dns-server-address> 12.1.0.2 </dns-server-address>\n "
+                               "<default-gateway>12.1.0.1</default-gateway>\n "
+                               "<dns-server-address>12.1.0.2</dns-server-address>\n "
                                "<enable-dhcp>true</enable-dhcp>\n "
                            "</subnets>\n "
                        "</ipam-subnets>\n ";