diff --git a/Source/Collections/ReadOnlyDictionary.Test.cs b/Source/Collections/ReadOnlyDictionary.Test.cs
index 0c0894a..f109d01 100644
--- a/Source/Collections/ReadOnlyDictionary.Test.cs
+++ b/Source/Collections/ReadOnlyDictionary.Test.cs
@@ -21,6 +21,8 @@ License along with this library
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
 
 #if UNITTEST
 
@@ -32,6 +34,442 @@ namespace Nuclex.Support.Collections {
   [TestFixture]
   public class ReadOnlyDictionaryTest {
 
+    /// <summary>
+    ///   Verifies that the copy constructor of the read only dictionary works
+    /// </summary>
+    [Test]
+    public void TestCopyConstructor() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      CollectionAssert.AreEqual(numbers, testDictionary);
+    }
+
+    /// <summary>Verifies that the IsReadOnly property returns true</summary>
+    [Test]
+    public void TestIsReadOnly() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.IsTrue(testDictionary.IsReadOnly);
+    }
+
+    /// <summary>
+    ///   Checks whether the Contains() method of the read only dictionary is able to
+    ///   determine if the dictionary contains an item
+    /// </summary>
+    [Test]
+    public void TestContains() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.IsTrue(
+        testDictionary.Contains(new KeyValuePair<int, string>(42, "forty-two"))
+      );
+      Assert.IsFalse(
+        testDictionary.Contains(new KeyValuePair<int, string>(24, "twenty-four"))
+      );
+    }
+
+    /// <summary>
+    ///   Checks whether the Contains() method of the read only dictionary is able to
+    ///   determine if the dictionary contains a key
+    /// </summary>
+    [Test]
+    public void TestContainsKey() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.IsTrue(testDictionary.ContainsKey(42));
+      Assert.IsFalse(testDictionary.ContainsKey(24));
+    }
+
+    /// <summary>
+    ///   Verifies that the CopyTo() of the read only dictionary works
+    /// </summary>
+    [Test]
+    public void TestCopyToArray() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      KeyValuePair<int, string>[] items = new KeyValuePair<int, string>[numbers.Count];
+
+      testDictionary.CopyTo(items, 0);
+
+      CollectionAssert.AreEqual(numbers, items);
+    }
+
+    /// <summary>
+    ///   Tests whether the typesafe enumerator of the read only dictionary is working
+    /// </summary>
+    [Test]
+    public void TestTypesafeEnumerator() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      List<KeyValuePair<int, string>> outputItems = new List<KeyValuePair<int, string>>();
+      foreach(KeyValuePair<int, string> item in testDictionary) {
+        outputItems.Add(item);
+      }
+
+      CollectionAssert.AreEqual(numbers, outputItems);
+    }
+
+    /// <summary>
+    ///   Tests whether the keys collection of the read only dictionary can be queried
+    /// </summary>
+    [Test]
+    public void TestGetKeysCollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      ICollection<int> inputKeys = numbers.Keys;
+      ICollection<int> keys = testDictionary.Keys;
+      CollectionAssert.AreEqual(inputKeys, keys);
+    }
+
+    /// <summary>
+    ///   Tests whether the values collection of the read only dictionary can be queried
+    /// </summary>
+    [Test]
+    public void TestGetValuesCollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      ICollection<string> inputValues = numbers.Values;
+      ICollection<string> values = testDictionary.Values;
+      CollectionAssert.AreEqual(inputValues, values);
+    }
+
+    /// <summary>
+    ///   Tests whether the TryGetValue() method of the read only dictionary is working
+    /// </summary>
+    [Test]
+    public void TestTryGetValue() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      string value;
+
+      Assert.IsTrue(testDictionary.TryGetValue(42, out value));
+      Assert.AreEqual("forty-two", value);
+
+      Assert.IsFalse(testDictionary.TryGetValue(24, out value));
+      Assert.AreEqual(null, value);
+    }
+
+    /// <summary>
+    ///   Tests whether the retrieval of values using the indexer of the read only
+    ///   dictionary is working
+    /// </summary>
+    [Test]
+    public void TestRetrieveValueByIndexer() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.AreEqual("forty-two", testDictionary[42]);
+    }
+
+    /// <summary>
+    ///   Tests whether an exception is thrown if the indexer of the read only dictionary
+    ///   is used to attempt to retrieve a non-existing value
+    /// </summary>
+    [Test, ExpectedException(typeof(KeyNotFoundException))]
+    public void TestThrowOnRetrieveNonExistingValueByIndexer() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      string numberName = testDictionary[24];
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Add() method is called via the generic IDictionary&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnAddAtViaGenericIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary<int, string>).Add(10, "ten");
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Remove() method is called via the generic IDictionary&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnRemoveViaGenericIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary<int, string>).Remove(3);
+    }
+
+    /// <summary>
+    ///   Tests whether the TryGetValue() method of the read only dictionary is working
+    /// </summary>
+    [Test]
+    public void TestRetrieveValueByIndexerViaGenericIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.AreEqual("forty-two", (testDictionary as IDictionary<int, string>)[42]);
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   indexer is used to insert an item via the generic IDictionar&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnReplaceByIndexerViaGenericIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary<int, string>)[24] = "twenty-four";
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Clear() method is called via the IDictionary interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnClearViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary).Clear();
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Add() method is called via the IDictionary interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnAddViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary).Add(24, "twenty-four");
+    }
+
+    /// <summary>
+    ///   Checks whether the Contains() method of the read only dictionary is able to
+    ///   determine if the dictionary contains an item via the IDictionary interface
+    /// </summary>
+    [Test]
+    public void TestContainsViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.IsTrue((testDictionary as IDictionary).Contains(42));
+      Assert.IsFalse((testDictionary as IDictionary).Contains(24));
+    }
+
+    /// <summary>
+    ///   Checks whether the GetEnumerator() method of the read only dictionary returns
+    ///   a working enumerator if accessed via the IDictionary interface
+    /// </summary>
+    [Test]
+    public void TestEnumeratorViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Dictionary<int, string> outputNumbers = new Dictionary<int, string>();
+      foreach(DictionaryEntry entry in (testDictionary as IDictionary)) {
+        (outputNumbers as IDictionary).Add(entry.Key, entry.Value);
+      }
+
+      CollectionAssert.AreEqual(numbers, outputNumbers);
+    }
+
+    /// <summary>
+    ///   Checks whether the IsFixedSize property of the read only dictionary returns
+    ///   the expected result for a read only dictionary based on a dynamic dictionary
+    /// </summary>
+    [Test]
+    public void TestIsFixedSizeViaIList() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.IsFalse((testDictionary as IDictionary).IsFixedSize);
+    }
+
+    /// <summary>
+    ///   Tests whether the keys collection of the read only dictionary can be queried
+    ///   via the IDictionary interface
+    /// </summary>
+    [Test]
+    public void TestGetKeysCollectionViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      ICollection inputKeys = (numbers as IDictionary).Keys;
+      ICollection keys = (testDictionary as IDictionary).Keys;
+      CollectionAssert.AreEqual(inputKeys, keys);
+    }
+
+    /// <summary>
+    ///   Tests whether the values collection of the read only dictionary can be queried
+    ///   via the IDictionary interface
+    /// </summary>
+    [Test]
+    public void TestGetValuesCollectionViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      ICollection inputValues = (numbers as IDictionary).Values;
+      ICollection values = (testDictionary as IDictionary).Values;
+      CollectionAssert.AreEqual(inputValues, values);
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Remove() method is called via the IDictionary interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnRemoveViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary).Remove(3);
+    }
+
+    /// <summary>
+    ///   Tests whether the retrieval of values using the indexer of the read only
+    ///   dictionary is working via the IDictionary interface
+    /// </summary>
+    [Test]
+    public void TestRetrieveValueByIndexerViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      Assert.AreEqual("forty-two", (testDictionary as IDictionary)[42]);
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   indexer is used to insert an item via the IDictionary interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnReplaceByIndexerViaIDictionary() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as IDictionary)[24] = "twenty-four";
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Add() method is used via the generic ICollection&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnAddViaGenericICollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as ICollection<KeyValuePair<int, string>>).Add(
+        new KeyValuePair<int, string>(24, "twenty-four")
+      );
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Clear() method is used via the generic ICollection&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnClearViaGenericICollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as ICollection<KeyValuePair<int, string>>).Clear();
+    }
+
+    /// <summary>
+    ///   Checks whether the read only dictionary will throw an exception if its
+    ///   Clear() method is used via the generic ICollection&lt;&gt; interface
+    /// </summary>
+    [Test, ExpectedException(typeof(NotSupportedException))]
+    public void TestThrowOnRemoveViaGenericICollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      (testDictionary as ICollection<KeyValuePair<int, string>>).Remove(
+        new KeyValuePair<int, string>(24, "twenty-four")
+      );
+    }
+
+    /// <summary>
+    ///   Verifies that the CopyTo() of the read only dictionary works when called
+    ///   via the the ICollection interface
+    /// </summary>
+    [Test]
+    public void TestCopyToArrayViaICollection() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      KeyValuePair<int, string>[] items = new KeyValuePair<int, string>[numbers.Count];
+      (testDictionary as ICollection).CopyTo(items, 0);
+      CollectionAssert.AreEqual(numbers, items);
+    }
+
+    /// <summary>
+    ///   Verifies that the IsSynchronized property and the SyncRoot property are working
+    /// </summary>
+    [Test]
+    public void TestSynchronization() {
+      Dictionary<int, string> numbers = createTestDictionary();
+      ReadOnlyDictionary<int, string> testDictionary = makeReadOnly(numbers);
+
+      if(!(testDictionary as ICollection).IsSynchronized) {
+        lock((testDictionary as ICollection).SyncRoot) {
+          int count = testDictionary.Count;
+        }
+      }
+    }
+
+    /// <summary>
+    ///   Test whether the read only dictionary can be serialized
+    /// </summary>
+    [Test]
+    public void TestSerialization() {
+      BinaryFormatter formatter = new BinaryFormatter();
+
+      using(MemoryStream memory = new MemoryStream()) {
+        Dictionary<int, string> numbers = createTestDictionary();
+        ReadOnlyDictionary<int, string> testDictionary1 = makeReadOnly(numbers);
+
+        formatter.Serialize(memory, testDictionary1);
+        memory.Position = 0;
+        object testDictionary2 = formatter.Deserialize(memory);
+
+        CollectionAssert.AreEqual(testDictionary1, (IEnumerable)testDictionary2);
+      }
+    }
+
+    /// <summary>
+    ///   Creates a new read-only dictionary filled with some values for testing
+    /// </summary>
+    /// <returns>The newly created read-only dictionary</returns>
+    private static Dictionary<int, string> createTestDictionary() {
+      Dictionary<int, string> numbers = new Dictionary<int, string>();
+      numbers.Add(1, "one");
+      numbers.Add(2, "two");
+      numbers.Add(3, "three");
+      numbers.Add(42, "forty-two");
+      return new Dictionary<int, string>(numbers);
+    }
+
+    /// <summary>
+    ///   Creates a new read-only dictionary filled with some values for testing
+    /// </summary>
+    /// <returns>The newly created read-only dictionary</returns>
+    private static ReadOnlyDictionary<int, string> makeReadOnly(
+      IDictionary<int, string> dictionary
+    ) {
+      return new ReadOnlyDictionary<int, string>(dictionary);
+    }
+
   }
 
 } // namespace Nuclex.Support.Collections
diff --git a/Source/Collections/ReadOnlyDictionary.cs b/Source/Collections/ReadOnlyDictionary.cs
index fbbfc76..7310df7 100644
--- a/Source/Collections/ReadOnlyDictionary.cs
+++ b/Source/Collections/ReadOnlyDictionary.cs
@@ -29,12 +29,42 @@ namespace Nuclex.Support.Collections {
   /// <summary>Wraps a Dictionary and prevents users from modifying it</summary>
   /// <typeparam name="KeyType">Type of the keys used in the Dictionary</typeparam>
   /// <typeparam name="ValueType">Type of the values used in the Dictionary</typeparam>
+  [Serializable]
   public class ReadOnlyDictionary<KeyType, ValueType> :
     IDictionary<KeyType, ValueType>,
     IDictionary,
     ISerializable,
     IDeserializationCallback {
 
+    #region class SerializedDictionary
+
+    /// <summary>
+    ///   Dictionary wrapped used to reconstruct a serialized read only dictionary
+    /// </summary>
+    private class SerializedDictionary : Dictionary<KeyType, ValueType> {
+
+      /// <summary>
+      ///   Initializes a new instance of the System.WeakReference class, using deserialized
+      ///   data from the specified serialization and stream objects.
+      /// </summary>
+      /// <param name="info">
+      ///   An object that holds all the data needed to serialize or deserialize the
+      ///   current System.WeakReference object.
+      /// </param>
+      /// <param name="context">
+      ///   (Reserved) Describes the source and destination of the serialized stream
+      ///   specified by info.
+      /// </param>
+      /// <exception cref="System.ArgumentNullException">
+      ///   The info parameter is null.
+      /// </exception>
+      public SerializedDictionary(SerializationInfo info, StreamingContext context) :
+        base(info, context) { }
+
+    }
+
+    #endregion // class SerializeDictionary
+
     /// <summary>Initializes a new read-only Dictionary wrapper</summary>
     /// <param name="dictionary">Dictionary that will be wrapped</param>
     public ReadOnlyDictionary(IDictionary<KeyType, ValueType> dictionary) {
@@ -42,6 +72,24 @@ namespace Nuclex.Support.Collections {
       this.objectDictionary = (this.typedDictionary as IDictionary);
     }
 
+    /// <summary>
+    ///   Initializes a new instance of the System.WeakReference class, using deserialized
+    ///   data from the specified serialization and stream objects.
+    /// </summary>
+    /// <param name="info">
+    ///   An object that holds all the data needed to serialize or deserialize the
+    ///   current System.WeakReference object.
+    /// </param>
+    /// <param name="context">
+    ///   (Reserved) Describes the source and destination of the serialized stream
+    ///   specified by info.
+    /// </param>
+    /// <exception cref="System.ArgumentNullException">
+    ///   The info parameter is null.
+    /// </exception>
+    protected ReadOnlyDictionary(SerializationInfo info, StreamingContext context) :
+      this(new SerializedDictionary(info, context)) { }
+
     /// <summary>Whether the directory is write-protected</summary>
     public bool IsReadOnly {
       get { return true; }
diff --git a/Source/Collections/ReadOnlyList.Test.cs b/Source/Collections/ReadOnlyList.Test.cs
index ed623e9..6b4b84f 100644
--- a/Source/Collections/ReadOnlyList.Test.cs
+++ b/Source/Collections/ReadOnlyList.Test.cs
@@ -187,7 +187,7 @@ namespace Nuclex.Support.Collections {
     }
 
     /// <summary>
-    ///   Tests whether the typesafe enumerator of the read only collection is working
+    ///   Tests whether the typesafe enumerator of the read only list is working
     /// </summary>
     [Test]
     public void TestTypesafeEnumerator() {