diff --git a/src/unit_tests/PFImporterTest/PFImporterTest.cpp b/src/unit_tests/PFImporterTest/PFImporterTest.cpp
index e4ea13f7b..e9f6b2aaa 100644
--- a/src/unit_tests/PFImporterTest/PFImporterTest.cpp
+++ b/src/unit_tests/PFImporterTest/PFImporterTest.cpp
@@ -212,6 +212,7 @@ void PFImporterTest::macrosTest()
         openTestFile("test_data/pf-macros.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -230,6 +231,7 @@ void PFImporterTest::hostsMatchTest()
         openTestFile("test_data/pf-hosts-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -251,6 +253,7 @@ void PFImporterTest::blockReturnTest()
         openTestFile("test_data/pf-block-return-actions.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -272,6 +275,7 @@ void PFImporterTest::icmpMatchTest()
         openTestFile("test_data/pf-icmp-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -293,6 +297,7 @@ void PFImporterTest::interfaceMatchTest()
         openTestFile("test_data/pf-interface-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -314,6 +319,7 @@ void PFImporterTest::portMatchTest()
         openTestFile("test_data/pf-port-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -335,6 +341,7 @@ void PFImporterTest::setCommandsTest()
         openTestFile("test_data/pf-set-commands.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -356,6 +363,7 @@ void PFImporterTest::stateMatchTest()
         openTestFile("test_data/pf-state-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -377,6 +385,7 @@ void PFImporterTest::tcpFlagsMatchTest()
         openTestFile("test_data/pf-tcp-flags-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -398,6 +407,7 @@ void PFImporterTest::natCommands()
         openTestFile("test_data/pf-nat-rules.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -419,6 +429,7 @@ void PFImporterTest::rdrCommands()
         openTestFile("test_data/pf-rdr-rules.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -440,6 +451,7 @@ void PFImporterTest::setTimeoutCommands()
         openTestFile("test_data/pf-timeouts.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -459,6 +471,7 @@ void PFImporterTest::scrubCommandsOld()
         openTestFile("test_data/pf-scrub-commands-old.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -475,6 +488,7 @@ void PFImporterTest::scrubCommandsNew()
         openTestFile("test_data/pf-scrub-commands-new.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -491,6 +505,7 @@ void PFImporterTest::tableDefinitions()
         openTestFile("test_data/pf-tables.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -510,6 +525,7 @@ void PFImporterTest::userGroupMatches()
         openTestFile("test_data/pf-user-group-matches.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
@@ -531,6 +547,7 @@ void PFImporterTest::routeToTest()
         openTestFile("test_data/pf-route-to.conf"));
 
     Importer* imp = new PFImporter(lib, instream, logger, "test_fw");
+    imp->setAddStandardCommentsFlag(true);
     CPPUNIT_ASSERT_NO_THROW( imp->run() );
     imp->finalize();
 
diff --git a/src/unit_tests/PFImporterTest/test_data/pf-route-to.fwb b/src/unit_tests/PFImporterTest/test_data/pf-route-to.fwb
index 5871d3756..df4edbff1 100644
--- a/src/unit_tests/PFImporterTest/test_data/pf-route-to.fwb
+++ b/src/unit_tests/PFImporterTest/test_data/pf-route-to.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="22" lastModified="1309988144" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="22" lastModified="1310062508" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -479,6 +479,7 @@
               <Option name="pf_route_opt_addr">10.1.2.3</Option>
               <Option name="pf_route_opt_if">em0</Option>
               <Option name="pf_route_option">route_through</Option>
+              <Option name="routing">True</Option>
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
@@ -502,6 +503,7 @@
               <Option name="pf_route_opt_addr">10.3.4.5</Option>
               <Option name="pf_route_opt_if">bce0</Option>
               <Option name="pf_route_option">route_reply_through</Option>
+              <Option name="routing">True</Option>
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
@@ -525,6 +527,7 @@
               <Option name="pf_route_opt_addr">10.1.2.3</Option>
               <Option name="pf_route_opt_if">em0</Option>
               <Option name="pf_route_option">route_copy_through</Option>
+              <Option name="routing">True</Option>
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>