Index: Core/Common/src/Core.Common.Gui/Converters/ExpandableArrayConverter.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rce50b65f662bcccb1849444e4d51549731131234
--- Core/Common/src/Core.Common.Gui/Converters/ExpandableArrayConverter.cs	(.../ExpandableArrayConverter.cs)	(revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Common/src/Core.Common.Gui/Converters/ExpandableArrayConverter.cs	(.../ExpandableArrayConverter.cs)	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -28,7 +28,7 @@
 namespace Core.Common.Gui.Converters
 {
     /// <summary>
-    /// <see cref="ArrayConverter"/> with modified conversion to string and shows as array
+    /// <see cref="ArrayConverter"/> with modified conversion to string and shows an array
     /// starting with index 1 instead of 0.
     /// </summary>
     public class ExpandableArrayConverter : ArrayConverter
Index: Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rce50b65f662bcccb1849444e4d51549731131234
--- Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs	(.../PngToIconConverter.cs)	(revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs	(.../PngToIconConverter.cs)	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -20,19 +20,26 @@
 // All rights reserved.
 
 using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Globalization;
 using System.IO;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
 namespace Core.Common.Gui.Converters
 {
+    /// <summary>
+    /// Converter to change a <see cref="Bitmap"/> instance to a <see cref="BitmapImage"/> instance.
+    /// </summary>
     public class PngToIconConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             MemoryStream ms = new MemoryStream();
-            ((System.Drawing.Bitmap)value).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-            BitmapImage image = new BitmapImage();
+            ((Bitmap)value).Save(ms, ImageFormat.Png);
+
+            var image = new BitmapImage();
             image.BeginInit();
             ms.Seek(0, SeekOrigin.Begin);
             image.StreamSource = ms;
@@ -41,7 +48,7 @@
             return image;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }
Index: Core/Common/test/Core.Common.Gui.Test/Converters/ExpandableArrayConverterTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Converters/ExpandableArrayConverterTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Converters/ExpandableArrayConverterTest.cs	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -0,0 +1,132 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+
+using Core.Common.Gui.Converters;
+
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Converters
+{
+    [TestFixture]
+    public class ExpandableArrayConverterTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Setup
+
+            // Call
+            var converter = new ExpandableArrayConverter();
+
+            // Assert
+            Assert.IsInstanceOf<ArrayConverter>(converter);
+        }
+
+        [Test]
+        public void ConvertTo_FromArrayToString_ReturnCountText([Random(0, 10, 1)]int arrayCount)
+        {
+            // Setup
+            var sourceArray = new int[arrayCount];
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            var text = converter.ConvertTo(sourceArray, typeof(string));
+
+            // Assert
+            Assert.AreEqual(string.Format("Aantal ({0})", arrayCount), text);
+        }
+
+        [Test]
+        public void ConvertTo_FromNullToString_ReturnEmptyText()
+        {
+            // Setup
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            var text = converter.ConvertTo(null, typeof(string));
+
+            // Assert
+            Assert.AreEqual(string.Empty, text);
+        }
+
+        [Test]
+        public void ConvertTo_FromArrayToInt_ThrowsInvalidOperationException()
+        {
+            // Setup
+            var sourceArray = new int[1];
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            TestDelegate call = () => converter.ConvertTo(sourceArray, typeof(int));
+
+            // Assert
+            Assert.Throws<NotSupportedException>(call);
+        }
+
+        [Test]
+        public void ConvertTo_FromArrayToString_ReturnCountText()
+        {
+            // Setup
+            var sourceArray = new int[2];
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            TestDelegate call =() => converter.ConvertTo(sourceArray, null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(call);
+        }
+
+        [Test]
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(12)]
+        public void GetProperties_FromArray_ReturnPropertyDescriptorsForEachElementWithNameToOneBasedIndex(int elementCount)
+        {
+            // Setup
+            var array = Enumerable.Range(10, elementCount).ToArray();
+
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            var propertyDescriptors = converter.GetProperties(array);
+
+            // Assert
+            Assert.IsNotNull(propertyDescriptors);
+            Assert.AreEqual(elementCount, propertyDescriptors.Count);
+            for (int i = 0; i < elementCount; i++)
+            {
+                Assert.AreEqual(array.GetType(), propertyDescriptors[i].ComponentType);
+                Assert.AreEqual(string.Format("[{0}]", i + 1), propertyDescriptors[i].Name);
+                Assert.AreEqual(string.Format("[{0}]", i + 1), propertyDescriptors[i].DisplayName);
+                Assert.AreEqual(typeof(int), propertyDescriptors[i].PropertyType);
+                CollectionAssert.IsEmpty(propertyDescriptors[i].Attributes);
+
+                Assert.AreEqual(array[i], propertyDescriptors[i].GetValue(array));
+            }
+        }
+
+
+        [Test]
+        public void GetProperties_FromArray_SettingValuesShouldUpdateArray()
+        {
+            // Setup
+            const int elementCount = 12;
+            var array = Enumerable.Repeat(10, elementCount).ToArray();
+
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            var propertyDescriptors = converter.GetProperties(array);
+            for (int i = 0; i < elementCount; i++)
+            {
+                propertyDescriptors[i].SetValue(array, i);
+            }
+
+            // Assert
+            CollectionAssert.AreEqual(Enumerable.Range(0, elementCount), array);
+
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Converters/PngToIconConverterTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Converters/PngToIconConverterTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Converters/PngToIconConverterTest.cs	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.Test.Properties;
+
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Converters
+{
+    [TestFixture]
+    public class PngToIconConverterTest
+    {
+        [Test]
+        public void DefaultConcstructor_ExpectedValues()
+        {
+            // Call
+            var converter = new PngToIconConverter();
+
+            // Assert
+            Assert.IsInstanceOf<IValueConverter>(converter);
+        }
+
+        [Test]
+        public void Convert_WithPngImage_ConvertToBitmapImage()
+        {
+            // Setup
+            var converter = new PngToIconConverter();
+
+            // Call
+            var bitmap = converter.Convert(Resources.abacus, typeof(BitmapImage), null, CultureInfo.InvariantCulture);
+
+            // Assert
+            Assert.IsInstanceOf<BitmapImage>(bitmap);
+            var bitmapInstance = (BitmapImage)bitmap;
+            Assert.AreEqual(16, bitmapInstance.Height);
+            Assert.AreEqual(16, bitmapInstance.Width);
+        }
+
+        [Test]
+        public void ConvertBack_ThrowNotImplementedException()
+        {
+            // Setup
+            var converter = new PngToIconConverter();
+
+            // Call
+            TestDelegate call = () => converter.ConvertBack(new BitmapImage(), typeof(Bitmap), null, CultureInfo.InvariantCulture);
+
+            // Assert
+            Assert.Throws<NotImplementedException>(call);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -r791e86bf9004a55178386416eb6a9c545380bd1c -rce50b65f662bcccb1849444e4d51549731131234
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 791e86bf9004a55178386416eb6a9c545380bd1c)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -75,7 +75,14 @@
     <Compile Include="ContextMenu\StrictContextMenuItemTest.cs" />
     <Compile Include="ContextMenu\TreeViewContextMenuItemFactoryTest.cs" />
     <Compile Include="ContextMenu\GuiContextMenuItemFactoryTest.cs" />
+    <Compile Include="Converters\ExpandableArrayConverterTest.cs" />
+    <Compile Include="Converters\PngToIconConverterTest.cs" />
     <Compile Include="ExpandableArrayConverterTest.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="PropertyBag\DynamicPropertyBagTest.cs" />
     <Compile Include="PropertyBag\PropertySpecDescriptorTest.cs" />
     <Compile Include="PropertyBag\PropertySpecTest.cs" />
@@ -119,6 +126,15 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\abacus.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/test/Core.Common.Gui.Test/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Properties/Resources.Designer.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Properties/Resources.Designer.cs	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18444
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Common.Gui.Test.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Gui.Test.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap abacus {
+            get {
+                object obj = ResourceManager.GetObject("abacus", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
Index: Core/Common/test/Core.Common.Gui.Test/Properties/Resources.resx
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Properties/Resources.resx	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Properties/Resources.resx	(revision ce50b65f662bcccb1849444e4d51549731131234)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="abacus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\abacus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Resources/abacus.png
===================================================================
diff -u
Binary files differ