diff --git a/ANX.Framework/DrawableGameComponent.cs b/ANX.Framework/DrawableGameComponent.cs
index e6621d0f..4155d7c8 100644
--- a/ANX.Framework/DrawableGameComponent.cs
+++ b/ANX.Framework/DrawableGameComponent.cs
@@ -1,6 +1,7 @@
 #region Using Statements
 using System;
 using ANX.Framework.Graphics;
+using ANX.Framework.NonXNA.Development;
 
 #endregion // Using Statements
 
@@ -10,10 +11,28 @@ using ANX.Framework.Graphics;
 
 namespace ANX.Framework
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
     public class DrawableGameComponent : GameComponent, IDrawable
     {
+        #region Private Members
         private bool isInitialized;
         private IGraphicsDeviceService device;
+        private int drawOrder;
+        private bool visible = true;
+
+        #endregion
+
+        #region Events
+        public event EventHandler<EventArgs> DrawOrderChanged;
+        public event EventHandler<EventArgs> VisibleChanged;
+
+        #endregion
+
+        public DrawableGameComponent(Game game)
+            : base(game)
+        {
+        }
 
         public GraphicsDevice GraphicsDevice
         {
@@ -27,8 +46,6 @@ namespace ANX.Framework
             }
         }
 
-        private int drawOrder;
-
         public int DrawOrder
         {
             get { return drawOrder; }
@@ -42,8 +59,6 @@ namespace ANX.Framework
             }
         }
 
-        private bool visible = true;
-
         public bool Visible
         {
             get { return visible; }
@@ -57,15 +72,6 @@ namespace ANX.Framework
             }
         }
         
-        public event EventHandler<EventArgs> DrawOrderChanged;
-
-        public event EventHandler<EventArgs> VisibleChanged;
-
-        public DrawableGameComponent(Game game)
-            : base(game)
-        {
-        }
-
         protected virtual void OnDrawOrderChanged(object sender, EventArgs arg)
         {
             if (DrawOrderChanged != null)
diff --git a/ANX.Framework/Game.cs b/ANX.Framework/Game.cs
index 1455703f..81c02acd 100644
--- a/ANX.Framework/Game.cs
+++ b/ANX.Framework/Game.cs
@@ -6,6 +6,7 @@ using ANX.Framework.Graphics;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.PlatformSystem;
 using System.Collections.Generic;
+using ANX.Framework.NonXNA.Development;
 
 #endregion // Using Statements
 
@@ -15,6 +16,8 @@ using System.Collections.Generic;
 
 namespace ANX.Framework
 {
+    [PercentageComplete(30)]
+    [TestState(TestStateAttribute.TestState.Untested)]
 	public class Game : IDisposable
 	{
 		private IGraphicsDeviceManager graphicsDeviceManager;
diff --git a/ANX.Framework/GameComponent.cs b/ANX.Framework/GameComponent.cs
index b7d9aeed..e22e1471 100644
--- a/ANX.Framework/GameComponent.cs
+++ b/ANX.Framework/GameComponent.cs
@@ -1,5 +1,6 @@
 #region Using Statements
 using System;
+using ANX.Framework.NonXNA.Development;
 
 
 #endregion // Using Statements
@@ -10,6 +11,8 @@ using System;
 
 namespace ANX.Framework
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
     public class GameComponent : IGameComponent, IUpdateable, IDisposable
     {
         private bool enabled = true;
diff --git a/ANX.Framework/GameComponentCollection.cs b/ANX.Framework/GameComponentCollection.cs
index 83b38cb1..8d1cc02c 100644
--- a/ANX.Framework/GameComponentCollection.cs
+++ b/ANX.Framework/GameComponentCollection.cs
@@ -1,6 +1,7 @@
 #region Using Statements
 using System;
 using System.Collections.ObjectModel;
+using ANX.Framework.NonXNA.Development;
 
 #endregion // Using Statements
 
@@ -10,6 +11,8 @@ using System.Collections.ObjectModel;
 
 namespace ANX.Framework
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
     public sealed class GameComponentCollection : Collection<IGameComponent>
     {
         #region Events
diff --git a/ANX.Framework/GameComponentCollectionEventArgs.cs b/ANX.Framework/GameComponentCollectionEventArgs.cs
index 56ca1ce7..9a8a5730 100644
--- a/ANX.Framework/GameComponentCollectionEventArgs.cs
+++ b/ANX.Framework/GameComponentCollectionEventArgs.cs
@@ -1,5 +1,6 @@
 #region Using Statements
 using System;
+using ANX.Framework.NonXNA.Development;
 
 
 #endregion // Using Statements
@@ -10,6 +11,8 @@ using System;
 
 namespace ANX.Framework
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
     public class GameComponentCollectionEventArgs : EventArgs
     {
         public GameComponentCollectionEventArgs(IGameComponent gameComponent)