Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r1221 -r1558
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 1221)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 1558)
@@ -19,9 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.General.TimeSeries;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.RegionalAssessmentResults;
@@ -224,9 +226,49 @@
             damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Error, null, "Error 1"));
             damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Error, null, "Error 2"));
             damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Warning, null, "Warning 1"));
+
+            FillOutputTimeSeries(damProjectData);
             return damProjectData;
         }
 
+        private void FillOutputTimeSeries(DamProjectData damProjectData)
+        {
+            const int timeSeriesCount = 2;
+            const int timeEntriesCount = 3;
+            const string idPipingBligh = "PipingFactorBligh";
+            const string idStabilityInsideFactor = "StabilityInsideFactor";
+            damProjectData.OutputTimeSerieCollection = new TimeSerieCollection();
+            for (int i = 0; i < timeSeriesCount; i++)
+            {
+                string locationId = String.Format("location{0}", i);
+                var timeSerie = damProjectData.OutputTimeSerieCollection.AddNewSeries(locationId);
+                timeSerie.ParameterId = (i % 2 == 0) ? idPipingBligh : idStabilityInsideFactor;
+                timeSerie.ForecastDateTime = DateTime.Now;
+                timeSerie.Type = "instantaneous";
+                timeSerie.StartDateTime = new DateTime(2012, 12, 31);
+                timeSerie.EndDateTime = new DateTime(2012, 12, 31, 1, 0, 0);
+                timeSerie.MissVal = -9999.0;
+                timeSerie.LongName = timeSerie.LocationId + "long";
+                timeSerie.StationName = String.Format("station{0}", i);
+                timeSerie.Units = "m";
+                timeSerie.SourceOrganisation = String.Format("organisation{0}", i);
+                timeSerie.SourceSystem = String.Format("system{0}", i);
+                timeSerie.FileDescription = String.Format("filedescription{0}", i);
+                timeSerie.Region = String.Format("region{0}", i);
+                timeSerie.TimeStep.Multiplier = 3600;
+                timeSerie.TimeStep.Unit = TimeStepUnit.Second;
+                for (int j = 0; j < timeEntriesCount; j++)
+                {
+                    timeSerie.Entries.Add(new TimeSerieEntry
+                    {
+                        DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
+                        Value = 1 + j * 0.1,
+                        Flag = 1,
+                        BasisFileName = String.Format("BasisFileName{0}", i)
+                    });
+                }
+            }
+        }
         private void CompareDamProjectData(DamProjectData actual, DamProjectData expected)
         {
             var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r1554 -r1558
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 1554)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 1558)
@@ -80,7 +80,6 @@
         private IList<SoilProfile2D> soilProfiles2D;
         private List<Soil> databaseSoils = new List<Soil>();
         private TimeSerieCollection inputTimeSerieCollection = null;
-        private TimeSerieCollection outputTimeSerieCollection = null;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Dike"/> class.
@@ -224,24 +223,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the output time serie collection.
-        /// </summary>
-        /// <value>
-        /// Output time series for operational use
-        /// </value>
-        public TimeSerieCollection OutputTimeSerieCollection
-        {
-            get
-            {
-                return outputTimeSerieCollection;
-            }
-            set
-            {
-                outputTimeSerieCollection = value;
-            }
-        }
-
         public void Validate()
         {
             if (Locations == null || Locations.Count < 1)
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r1181 -r1558
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1181)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1558)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.General.Sensors;
+using Deltares.DamEngine.Data.General.TimeSeries;
 using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
@@ -39,6 +40,7 @@
         private DamProjectType damProjectType = DamProjectType.Operational;
         private List<LocationJob> jobs = new List<LocationJob>();
         private List<DesignResult> designCalculations;
+        private TimeSerieCollection outputTimeSerieCollection = null;
         private SensorData sensorData;
         private string calculationMap = "";
         private string projectPath = "";
@@ -51,9 +53,27 @@
         /// The calculation messages.
         /// </value>
         public List<LogMessage> CalculationMessages { get; set; } = null;
-        
 
+
         /// <summary>
+        /// Gets or sets the output time serie collection.
+        /// </summary>
+        /// <value>
+        /// Output time series for operational use
+        /// </value>
+        public TimeSerieCollection OutputTimeSerieCollection
+        {
+            get
+            {
+                return outputTimeSerieCollection;
+            }
+            set
+            {
+                outputTimeSerieCollection = value;
+            }
+        }
+
+        /// <summary>
         /// Constructor
         /// </summary>
         public DamProjectData()
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r1554 -r1558
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 1554)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 1558)
@@ -123,48 +123,9 @@
             FillSegments(damProjectData);
             FillLocations(dike, damProjectData.Segments, damProjectData.ProjectPath);
             FillInputTimeSeries(dike);
-            // FillOutputTimeSeries(dike);
             return damProjectData;
         }
 
-        private void FillOutputTimeSeries(Dike dike)
-        {
-            const int timeSeriesCount = 2;
-            const int timeEntriesCount = 3;
-            const string idPipingBligh = "PipingFactorBligh";
-            const string idStabilityInsideFactor = "StabilityInsideFactor";
-            dike.InputTimeSerieCollection = new TimeSerieCollection();
-            for (int i = 0; i < timeSeriesCount; i++)
-            {
-                string locationId = String.Format("location{0}", i);
-                var timeSerie = dike.InputTimeSerieCollection.AddNewSeries(locationId);
-                timeSerie.ParameterId = (i % 2 == 0) ? idPipingBligh : idStabilityInsideFactor;
-                timeSerie.ForecastDateTime = DateTime.Now;
-                timeSerie.Type = "instantaneous";
-                timeSerie.StartDateTime = new DateTime(2012, 12, 31);
-                timeSerie.EndDateTime = new DateTime(2012, 12, 31, 1, 0, 0);
-                timeSerie.MissVal = -9999.0;
-                timeSerie.LongName = timeSerie.LocationId + "long";
-                timeSerie.StationName = String.Format("station{0}", i);
-                timeSerie.Units = "m";
-                timeSerie.SourceOrganisation = String.Format("organisation{0}", i);
-                timeSerie.SourceSystem = String.Format("system{0}", i);
-                timeSerie.FileDescription = String.Format("filedescription{0}", i);
-                timeSerie.Region = String.Format("region{0}", i);
-                timeSerie.TimeStep.Multiplier = 3600;
-                timeSerie.TimeStep.Unit = TimeStepUnit.Second;
-                for (int j = 0; j < timeEntriesCount; j++)
-                {
-                    timeSerie.Entries.Add(new TimeSerieEntry
-                    {
-                        DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0),
-                        Value = 1 + j * 0.1,
-                        Flag = 1,
-                        BasisFileName = String.Format("BasisFileName{0}", i)
-                    });
-                }
-            }
-        }
 
         private void FillInputTimeSeries(Dike dike)
         {