diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
index 135f9a943..1bae4b526 100644
--- a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
@@ -11,30 +11,30 @@
 			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
 		</ParameterBag>
 		<TimedState Id="@booleanState" Name="Boolean State" Type="BooleanState">
-			<Value Time="0" Value="false" />
-			<Value Time="1" Value="true" />
-			<Value Time="2" Value="false" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" />
 		</TimedState>
 		<TimedState Id="@integerState" Name="Integer State" Type="IntegerState">
-			<Value Time="0" Value="1" />
-			<Value Time="1" Value="2" />
-			<Value Time="2" Value="3" />
-			<Value Time="3" Value="2" />
-			<Value Time="4" Value="1" />
-			<Value Time="5" Value="0" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="1" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="2" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="3" />
+			<Value Time="1970-01-01T00:03:00.000+01:00" Value="2" />
+			<Value Time="1970-01-01T00:04:00.000+01:00" Value="1" />
+			<Value Time="1970-01-01T00:05:00.000+01:00" Value="0" />
 		</TimedState>
 		<TimedState Id="@floatState" Name="Float State" Type="FloatState">
-			<Value Time="0" Value="1.1" />
-			<Value Time="1" Value="2.2" />
-			<Value Time="2" Value="3.3" />
-			<Value Time="3" Value="2.2" />
-			<Value Time="4" Value="1.1" />
-			<Value Time="5" Value="0.0" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3" />
+			<Value Time="1970-01-01T00:03:00.000+01:00" Value="2.2" />
+			<Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1" />
+			<Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0" />
 		</TimedState>
 		<TimedState Id="@stringSetState" Name="StringSet State" Type="StringSetState">
-			<Value Time="0" Value="foo" />
-			<Value Time="1" Value="foo, bar" />
-			<Value Time="2" Value="bar" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="foo" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="bar" />
 		</TimedState>
 	</Resource>
 </StrolchModel>
diff --git a/li.strolch.service/src/test/resources/svctest/data/Resources.xml b/li.strolch.service/src/test/resources/svctest/data/Resources.xml
index 2bcda50b1..da0c7ee5a 100644
--- a/li.strolch.service/src/test/resources/svctest/data/Resources.xml
+++ b/li.strolch.service/src/test/resources/svctest/data/Resources.xml
@@ -7,24 +7,24 @@
 		<ParameterBag Id="something" Name="Something" Type="Something" />
 		<TimedState Id="@state1" Name="State" Type="FloatState" />
 		<TimedState Id="@state2" Name="State" Type="FloatState">
-			<Value Time="0" Value="0.0" />
-			<Value Time="1" Value="1.0" />
-			<Value Time="2" Value="2.0" />
-			<Value Time="3" Value="1.0" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="0.0" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="1.0" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="2.0" />
+			<Value Time="1970-01-01T00:03:00.000+01:00" Value="1.0" />
 		</TimedState>
 		<TimedState Id="@state3" Name="State" Type="IntegerState" />
 		<TimedState Id="@state4" Name="State" Type="IntegerState">
-			<Value Time="0" Value="0" />
-			<Value Time="1" Value="1" />
-			<Value Time="2" Value="2" />
-			<Value Time="3" Value="1" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="0" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="1" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="2" />
+			<Value Time="1970-01-01T00:03:00.000+01:00" Value="1" />
 		</TimedState>
 		<TimedState Id="@state5" Name="State" Type="BooleanState" />
 		<TimedState Id="@state6" Name="State" Type="BooleanState">
-			<Value Time="0" Value="false" />
-			<Value Time="1" Value="true" />
-			<Value Time="2" Value="false" />
-			<Value Time="3" Value="true" />
+			<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" />
+			<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" />
+			<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" />
+			<Value Time="1970-01-01T00:03:00.000+01:00" Value="true" />
 		</TimedState>
 	</Resource>
 	<Resource Id="something" Name="Something" Type="Something" />