diff --git a/Nuclex.Support (net-4.0).csproj b/Nuclex.Support (net-4.0).csproj
index 9378f3d..14255fb 100644
--- a/Nuclex.Support (net-4.0).csproj	
+++ b/Nuclex.Support (net-4.0).csproj	
@@ -214,8 +214,7 @@
     <Compile Include="Source\Licensing\LicenseKey.Test.cs">
       <DependentUpon>LicenseKey.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\ParallelBackgroundWorker.cs" />
-    <Compile Include="Source\ParallelBackgroundWorker.Test.cs" />
+    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Argument.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
@@ -225,10 +224,13 @@
     <Compile Include="Source\Parsing\CommandLine.Test.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Parser.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\ParallelBackgroundWorker.cs" />
+    <Compile Include="Source\ParallelBackgroundWorker.Test.cs">
+      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Parsing\ParserHelper.cs" />
     <Compile Include="Source\Parsing\ParserHelper.Test.cs">
       <DependentUpon>ParserHelper.cs</DependentUpon>
diff --git a/Source/ParallelBackgroundWorker.Test.cs b/Source/ParallelBackgroundWorker.Test.cs
index f8835e1..f1c56a7 100644
--- a/Source/ParallelBackgroundWorker.Test.cs
+++ b/Source/ParallelBackgroundWorker.Test.cs
@@ -19,20 +19,22 @@ License along with this library
 #endregion
 
 using System;
-using System.IO;
+using System.Threading;
+using System.Collections.Generic;
 
 #if UNITTEST
 
 using NUnit.Framework;
-using System.Threading;
-using System.Collections.Generic;
 
 namespace Nuclex.Support {
 
   /// <summary>Unit Test for the parallel background worker class</summary>
   [TestFixture]
-  public class ParallelBackgroundWorkerTest {
+  internal class ParallelBackgroundWorkerTest {
 
+    #region class TestWorker
+
+    /// <summary>Implementation of a background worker used for unit testing</summary>
     private class TestWorker : ParallelBackgroundWorker<object> {
 
       /// <summary>Initializes a new parallel background worker with unlimited threads</summary>
@@ -51,14 +53,14 @@ namespace Nuclex.Support {
       ///   be created, so specifying -2 on a single-core system will still occupy
       ///   the only core.
       /// </remarks>
-      public TestWorker(int threadCount) : base(threadCount) {}
+      public TestWorker(int threadCount) : base(threadCount) { }
 
       /// <summary>
       ///   Initializes a new parallel background worker that uses the specified name for
       ///   its worker threads.
       /// </summary>
       /// <param name="name">Name that will be assigned to the worker threads</param>
-      public TestWorker(string name) : base(name) {}
+      public TestWorker(string name) : base(name) { }
 
       /// <summary>
       ///   Initializes a new parallel background worker that uses the specified name for
@@ -97,13 +99,20 @@ namespace Nuclex.Support {
         }
       }
 
+      /// <summary>Whether the work tasks should throw exceptions</summary>
       public bool ThrowException;
+      /// <summary>Event that can be used to stop work tasks from completing</summary>
       public ManualResetEvent WaitEvent;
+
+      /// <summary>Set by work tasks if they have been cancelled</summary>
       public bool WasCancelled;
+      /// <summary>Work tasks that have reached execution</summary>
       public ICollection<object> Tasks;
 
     }
 
+    #endregion // class TestWorker
+
     /// <summary>Verifies that the background worker has a default constructor</summary>
     [Test]
     public void CanBeDefaultConstructed() {
@@ -196,7 +205,7 @@ namespace Nuclex.Support {
 
           testWorker.AddTask(new object());
           testWorker.CancelRunningTasks();
-          
+
           waitEvent.Set();
 
           Assert.IsTrue(testWorker.Wait(1000));