diff --git a/src/MessageManager.cs b/src/MessageManager.cs
index 2f0cad1..a4bdfe6 100644
--- a/src/MessageManager.cs
+++ b/src/MessageManager.cs
@@ -14,6 +14,8 @@ namespace Encompass
             {
                 messageTypeToMessages.Add(typeof(TMessage), new List<IMessage>());
             }
+
+            messageTypeToMessages[typeof(TMessage)].Add(message);
         }
 
         internal void ClearMessages()
diff --git a/test/EngineTest.cs b/test/EngineTest.cs
index c1a6e2d..b094af9 100644
--- a/test/EngineTest.cs
+++ b/test/EngineTest.cs
@@ -12,7 +12,7 @@ namespace Tests
         static IEnumerable<MockComponent> resultComponents;
         static MockComponent resultComponent;
 
-        static IEnumerable<MockMessage> resultMessages;
+        static List<MockMessage> resultMessages;
 
         public class ReadComponentsTestEngine : Engine
         {
@@ -197,7 +197,7 @@ namespace Tests
         {
             public override void Update(float dt)
             {
-                resultMessages = this.ReadMessages<MockMessage>();
+                resultMessages = this.ReadMessages<MockMessage>().ToList();
             }
         }