diff --git a/Test.GBase/DataHandling/XmlDataHandlerTest.cs b/Test.GBase/DataHandling/XmlDataHandlerTest.cs
new file mode 100644
index 0000000..727d272
--- /dev/null
+++ b/Test.GBase/DataHandling/XmlDataHandlerTest.cs
@@ -0,0 +1,241 @@
+// Author: Gockner, Simon
+// Created: 2020-02-12
+// Copyright(c) 2020 SimonG. All Rights Reserved.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GBase.DataHandling;
+using GBase.Interfaces.DataHandling.Xml;
+using GBase.Interfaces.DataHandling.Xml.Cache;
+using GBase.Interfaces.DataHandling.Xml.Cache.Factories;
+using GBase.Interfaces.DataHandling.Xml.Factories;
+using Moq;
+using NUnit.Framework;
+
+namespace Test.GBase.DataHandling
+{
+    [TestFixture]
+    public class XmlDataHandlerTest
+    {
+        [Test]
+        public async Task TestInit()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            xmlDataReaderMock.Setup(r => r.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            xmlDataWriterMock.Setup(w => w.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            Assert.True(await xmlDataHandler.Init(false, CancellationToken.None));
+        }
+
+        [Test]
+        public async Task TestInitFailedTriedTwice()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            xmlDataReaderMock.Setup(r => r.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            xmlDataWriterMock.Setup(w => w.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            Assert.True(await xmlDataHandler.Init(false, CancellationToken.None));
+            Assert.False(await xmlDataHandler.Init(false, CancellationToken.None));
+        }
+
+        [Test]
+        public async Task TestInitFailedInitReaderFailed()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            xmlDataReaderMock.Setup(r => r.Init(It.IsAny<CancellationToken>())).ReturnsAsync(false);
+
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            xmlDataWriterMock.Setup(w => w.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            Assert.False(await xmlDataHandler.Init(false, CancellationToken.None));
+        }
+
+        [Test]
+        public async Task TestInitFailedInitWriterFailed()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            xmlDataReaderMock.Setup(r => r.Init(It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            xmlDataWriterMock.Setup(w => w.Init(It.IsAny<CancellationToken>())).ReturnsAsync(false);
+
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            Assert.False(await xmlDataHandler.Init(false, CancellationToken.None));
+        }
+
+        [Test]
+        public async Task TestSetValue()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            await xmlDataHandler.SetValue<XmlDataHandlerTest, string>("property", "SomeString");
+
+            xmlDataHandlerCacheMock.Verify(c => c.SetValue<XmlDataHandlerTest, string>("property", "SomeString", false), Times.Once);
+            xmlDataWriterMock.Verify(w => w.Write<XmlDataHandlerTest, string>("property", "SomeString", false), Times.Once);
+        }
+
+        [Test]
+        public async Task TestSetValueNull()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            await xmlDataHandler.SetValue<XmlDataHandlerTest, string>("property", null);
+
+            xmlDataHandlerCacheMock.Verify(c => c.SetValue<It.IsValueType, It.IsValueType>(It.IsAny<string>(), It.IsAny<It.IsValueType>(), It.IsAny<bool>()), Times.Never);
+            xmlDataWriterMock.Verify(w => w.Write<It.IsValueType, It.IsValueType>(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+        }
+
+        [Test]
+        public async Task TestRemoveValue()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            await xmlDataHandler.RemoveValue<XmlDataHandlerTest, string>("property", "SomeString");
+
+            xmlDataHandlerCacheMock.Verify(c => c.TryRemoveValue<XmlDataHandlerTest, string>("property", "SomeString"), Times.Once);
+            xmlDataWriterMock.Verify(w => w.Remove<XmlDataHandlerTest, string>("property", "SomeString"), Times.Once);
+        }
+
+        [Test]
+        public async Task TestRemoveValueNull()
+        {
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+
+            await xmlDataHandler.RemoveValue<XmlDataHandlerTest, string>("property", null);
+
+            xmlDataHandlerCacheMock.Verify(c => c.TryRemoveValue<It.IsValueType, It.IsValueType>(It.IsAny<string>(), It.IsAny<It.IsValueType>()), Times.Never);
+            xmlDataWriterMock.Verify(w => w.Remove<It.IsValueType, It.IsValueType>(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+        }
+
+        [Test]
+        public void TestGetValue()
+        {
+            List<string> values = new List<string>() { "SomeString", "AnotherString" };
+
+            Mock<IXmlDataReader> xmlDataReaderMock = new Mock<IXmlDataReader>();
+            //xmlDataReaderMock.Setup(r => r.Read<XmlDataHandlerTest, string>("property")).ReturnsAsync<List<string>>(values);
+
+            Mock<IXmlDataReaderFactory> xmlDataReaderFactoryMock = new Mock<IXmlDataReaderFactory>();
+            xmlDataReaderFactoryMock.Setup(r => r.Create(It.IsAny<string>())).Returns(xmlDataReaderMock.Object);
+
+            Mock<IXmlDataWriter> xmlDataWriterMock = new Mock<IXmlDataWriter>();
+            Mock<IXmlDataWriterFactory> xmlDataWriterFactoryMock = new Mock<IXmlDataWriterFactory>();
+            xmlDataWriterFactoryMock.Setup(w => w.Create(It.IsAny<string>(), It.IsAny<string>())).Returns(xmlDataWriterMock.Object);
+
+            Mock<IXmlDataHandlerCache> xmlDataHandlerCacheMock = new Mock<IXmlDataHandlerCache>();
+            Mock<IXmlDataHandlerCacheFactory> xmlDataHandlerCacheFactoryMock = new Mock<IXmlDataHandlerCacheFactory>();
+            xmlDataHandlerCacheFactoryMock.Setup(c => c.Create(It.IsAny<IXmlDataReader>())).Returns(xmlDataHandlerCacheMock.Object);
+
+            XmlDataHandler xmlDataHandler = new XmlDataHandler("path", "root", xmlDataReaderFactoryMock.Object,
+                xmlDataWriterFactoryMock.Object, xmlDataHandlerCacheFactoryMock.Object);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Test.GBase/Test.GBase.csproj b/Test.GBase/Test.GBase.csproj
index 47da60a..6cb49d4 100644
--- a/Test.GBase/Test.GBase.csproj
+++ b/Test.GBase/Test.GBase.csproj
@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
       <PrivateAssets>all</PrivateAssets>