Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/configurations.xml	(revision 186)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 209)
@@ -29,4 +29,10 @@
                    projectFiles="false"
                    kind="TEST_LOGICAL_FOLDER">
+      <logicalFolder name="f1"
+                     displayName="HighwaysParserTest"
+                     projectFiles="true"
+                     kind="TEST">
+        <itemPath>tests/HighwaysParserTest.cpp</itemPath>
+      </logicalFolder>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
@@ -46,9 +52,19 @@
       </toolsSet>
       <compileType>
-        <ccTool>
-          <incDir>
-            <pElem>tinyxml</pElem>
-          </incDir>
-        </ccTool>
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f2</output>
+        </linkerTool>
       </compileType>
       <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
@@ -66,4 +82,19 @@
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <folder path="TestFiles/f1">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f1</output>
+        </linkerTool>
+      </folder>
       <item path="fep.h" ex="false" tool="3" flavor2="0">
       </item>
@@ -73,4 +104,6 @@
       </item>
       <item path="network.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="tests/HighwaysParserTest.cpp" ex="false" tool="1" flavor2="0">
       </item>
     </conf>
@@ -84,7 +117,15 @@
         <cTool>
           <developmentMode>5</developmentMode>
-        </cTool>
-        <ccTool>
-          <developmentMode>5</developmentMode>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
+        </cTool>
+        <ccTool>
+          <developmentMode>5</developmentMode>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
         </ccTool>
         <fortranCompilerTool>
@@ -94,4 +135,13 @@
           <developmentMode>5</developmentMode>
         </asmTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f2</output>
+          <linkerLibItems>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+          </linkerLibItems>
+        </linkerTool>
       </compileType>
       <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
@@ -109,4 +159,19 @@
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <folder path="TestFiles/f1">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f1</output>
+        </linkerTool>
+      </folder>
       <item path="fep.h" ex="false" tool="3" flavor2="0">
       </item>
@@ -116,4 +181,76 @@
       </item>
       <item path="network.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="tests/HighwaysParserTest.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+    </conf>
+    <conf name="testHighwaysParser" type="1">
+      <toolsSet>
+        <compilerSet>default</compilerSet>
+        <dependencyChecking>true</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <compileType>
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+          <commandLine>`cppunit-config --cflags`</commandLine>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f2</output>
+          <linkerLibItems>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+            <linkerOptionItem>`cppunit-config --libs`</linkerOptionItem>
+          </linkerLibItems>
+        </linkerTool>
+      </compileType>
+      <item path="DataPacker.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="DataPacker.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="FEPSim.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="FEPSim.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="HighwaysParser.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="Main.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <folder path="TestFiles/f1">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+          </incDir>
+        </ccTool>
+        <linkerTool>
+          <output>${TESTDIR}/TestFiles/f1</output>
+        </linkerTool>
+      </folder>
+      <item path="fep.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="fep_clnt.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="fep_xdr.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="network.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="tests/HighwaysParserTest.cpp" ex="false" tool="1" flavor2="0">
       </item>
     </conf>