diff --git a/Nuclex.Support (net-4.0).csproj b/Nuclex.Support (net-4.0).csproj
index 48e83ad..1148e8d 100644
--- a/Nuclex.Support (net-4.0).csproj	
+++ b/Nuclex.Support (net-4.0).csproj	
@@ -201,10 +201,19 @@
     <Compile Include="Source\Settings\ConfigurationFileStore.Parsing.cs">
       <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.Test.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Settings\ISettingsStore.cs" />
     <Compile Include="Source\Settings\MemoryStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.Test.cs">
+      <DependentUpon>MemoryStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Settings\OptionInfo.cs" />
     <Compile Include="Source\Settings\WindowsRegistryStore.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.Test.cs">
+      <DependentUpon>WindowsRegistryStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\GarbagePolicy.cs" />
     <Compile Include="Source\IO\PartialStream.cs" />
     <Compile Include="Source\IO\PartialStream.Test.cs">
diff --git a/Source/Parsing/ParserHelper.Test.cs b/Source/Parsing/ParserHelper.Test.cs
index 91e12f7..9c3a65d 100644
--- a/Source/Parsing/ParserHelper.Test.cs
+++ b/Source/Parsing/ParserHelper.Test.cs
@@ -18,12 +18,12 @@ License along with this library
 */
 #endregion
 
+#if UNITTEST
+
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-#if UNITTEST
-
 using NUnit.Framework;
 
 namespace Nuclex.Support.Parsing {
diff --git a/Source/Settings/ConfigurationFileStore.Parsing.cs b/Source/Settings/ConfigurationFileStore.Parsing.cs
index e02eb7b..5444622 100644
--- a/Source/Settings/ConfigurationFileStore.Parsing.cs
+++ b/Source/Settings/ConfigurationFileStore.Parsing.cs
@@ -19,9 +19,11 @@ License along with this library
 #endregion
 
 using System;
+using System.Diagnostics;
 using System.IO;
 
 using Nuclex.Support.Parsing;
+using System.Collections.Generic;
 
 namespace Nuclex.Support.Settings {
 
@@ -105,7 +107,33 @@ namespace Nuclex.Support.Settings {
     private static void parseCategory(
       ParserState state, string line, int firstCharacterIndex
     ) {
-      throw new NotImplementedException();
+      Debug.Assert(line[firstCharacterIndex] == '[');
+
+      int nameStartIndex = firstCharacterIndex + 1;
+      ParserHelper.SkipSpaces(line, ref nameStartIndex);
+
+      int lastCharacterIndex = line.Length - 1;
+      if(nameStartIndex >= lastCharacterIndex) {
+        return; // No space left for closing brace
+      }
+      
+      int nameEndIndex = line.IndexOf(']', nameStartIndex);
+      if(nameEndIndex == -1) {
+        return; // No closing brace in line
+      }
+
+      do {
+        --nameEndIndex;
+      } while(char.IsWhiteSpace(line, nameEndIndex));
+
+      state.Category = new Category() {
+        LineIndex = state.Store.lines.Count - 1,
+        CategoryName = new StringSegment(
+          line, nameStartIndex, nameEndIndex - nameStartIndex + 1
+        ),
+        OptionLookup = new Dictionary<string, Option>()
+      };
+      state.Store.categories.Add(state.Category);
     }
 
     /// <summary>Parses an option definition encountered on a line</summary>
diff --git a/Source/Settings/ConfigurationFileStore.Test.cs b/Source/Settings/ConfigurationFileStore.Test.cs
new file mode 100644
index 0000000..bd61cb5
--- /dev/null
+++ b/Source/Settings/ConfigurationFileStore.Test.cs
@@ -0,0 +1,67 @@
+#region CPL License
+/*
+Nuclex Framework
+Copyright (C) 2002-2014 Nuclex Development Labs
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the IBM Common Public License as
+published by the IBM Corporation; either version 1.0 of the
+License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+IBM Common Public License for more details.
+
+You should have received a copy of the IBM Common Public
+License along with this library
+*/
+#endregion
+
+#if UNITTEST
+
+using System;
+
+using NUnit.Framework;
+using System.IO;
+using System.Linq;
+
+namespace Nuclex.Support.Settings {
+
+  /// <summary>Unit tests for the configuration file store</summary>
+  [TestFixture]
+  internal class ConfigurationFileStoreTest {
+
+    private static ConfigurationFileStore load(string fileContents) {
+      using(var reader = new StringReader(fileContents)) {
+        return ConfigurationFileStore.Parse(reader);
+      }
+    }
+
+    /// <summary>
+    ///   Verifies that loading an empty file doesn't lead to an exception
+    /// </summary>
+    [Test]
+    public void CanParseEmptyFile() {
+      Assert.That(() => load(string.Empty), Throws.Nothing);
+    }
+
+    /// <summary>
+    ///   Verifies that categories can be parsed from a configuration file
+    /// </summary>
+    [Test]
+    public void CanParseCategories() {
+      string[] categoryNames = new string[] { "Category1", "Category 2" };
+      string fileContents =
+        "[" + categoryNames[0] + "]\r\n" +
+        "  [  " + categoryNames[1] + "  ]  \r\n";
+      ConfigurationFileStore configurationFile = load(fileContents);
+
+      Assert.That(configurationFile.EnumerateCategories(), Is.EquivalentTo(categoryNames));
+    }
+
+  }
+
+} // namespace Nuclex.Support.Settings
+
+#endif // UNITTEST
diff --git a/Source/Settings/MemoryStore.Test.cs b/Source/Settings/MemoryStore.Test.cs
new file mode 100644
index 0000000..4be3be9
--- /dev/null
+++ b/Source/Settings/MemoryStore.Test.cs
@@ -0,0 +1,36 @@
+#region CPL License
+/*
+Nuclex Framework
+Copyright (C) 2002-2014 Nuclex Development Labs
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the IBM Common Public License as
+published by the IBM Corporation; either version 1.0 of the
+License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+IBM Common Public License for more details.
+
+You should have received a copy of the IBM Common Public
+License along with this library
+*/
+#endregion
+
+#if UNITTEST
+
+using System;
+
+using NUnit.Framework;
+
+namespace Nuclex.Support.Settings {
+
+  /// <summary>Unit tests for the memory settings store</summary>
+  [TestFixture]
+  internal class MemoryStoreTest {
+  }
+
+} // namespace Nuclex.Support.Settings
+
+#endif // UNITTEST
diff --git a/Source/Settings/WindowsRegistryStore.Test.cs b/Source/Settings/WindowsRegistryStore.Test.cs
new file mode 100644
index 0000000..a99399b
--- /dev/null
+++ b/Source/Settings/WindowsRegistryStore.Test.cs
@@ -0,0 +1,36 @@
+#region CPL License
+/*
+Nuclex Framework
+Copyright (C) 2002-2014 Nuclex Development Labs
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the IBM Common Public License as
+published by the IBM Corporation; either version 1.0 of the
+License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+IBM Common Public License for more details.
+
+You should have received a copy of the IBM Common Public
+License along with this library
+*/
+#endregion
+
+#if UNITTEST
+
+using System;
+
+using NUnit.Framework;
+
+namespace Nuclex.Support.Settings {
+
+  /// <summary>Unit tests for the windows registry settings store</summary>
+  [TestFixture]
+  internal class WindowsRegistryStoreTest {
+  }
+
+} // namespace Nuclex.Support.Settings
+
+#endif // UNITTEST