diff --git a/src/Game/Systems/AmmoPickupSystem.cpp b/src/Game/Systems/AmmoPickupSystem.cpp
index 561abbdb..26f31a3e 100644
--- a/src/Game/Systems/AmmoPickupSystem.cpp
+++ b/src/Game/Systems/AmmoPickupSystem.cpp
@@ -78,7 +78,7 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     return true;
 }
 bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
-    //triggerleave erases possible AmmoPickupAtMaxHealthAmmo
+    //triggerleave erases possible m_PickupAtMaximum
     for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
         if (it->pickup.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
             m_PickupAtMaximum.erase(it);
diff --git a/src/Game/Systems/HealthPickupSystem.cpp b/src/Game/Systems/HealthPickupSystem.cpp
index b5941bec..621fea37 100644
--- a/src/Game/Systems/HealthPickupSystem.cpp
+++ b/src/Game/Systems/HealthPickupSystem.cpp
@@ -44,7 +44,7 @@ void HealthPickupSystem::Update(double dt)
             break;
 
         }
-        if ((int)it->player["Health"]["Health"] < (int)it->player["Health"]["MaxHealth"]) {
+        if ((double)it->player["Health"]["Health"] < (double)it->player["Health"]["MaxHealth"]) {
             DoPickup(it->player, it->pickup);
             m_PickupAtMaximum.erase(it);
             break;
@@ -53,7 +53,6 @@ void HealthPickupSystem::Update(double dt)
     }
 }
 
-
 bool HealthPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
     if (!e.Trigger.HasComponent("HealthPickup")) {
@@ -69,7 +68,7 @@ bool HealthPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     return true;
 }
 bool HealthPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
-    //triggerleave erases possible AmmoPickupAtMaxHealthAmmo
+    //triggerleave erases possible m_PickupAtMaximum
     for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
         if (it->pickup.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
             m_PickupAtMaximum.erase(it);
@@ -78,6 +77,7 @@ bool HealthPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
     }
     return true;
 }
+
 void HealthPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
     double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
 
diff --git a/src/Tests/PickupSpawnTest.cpp b/src/Tests/HealthPickupTest.cpp
similarity index 99%
rename from src/Tests/PickupSpawnTest.cpp
rename to src/Tests/HealthPickupTest.cpp
index fe33bf1a..bcdda99e 100644
--- a/src/Tests/PickupSpawnTest.cpp
+++ b/src/Tests/HealthPickupTest.cpp
@@ -2,7 +2,7 @@
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
 
-#include "PickupSpawnTest.h"
+#include "HealthPickupTest.h"
 
 BOOST_AUTO_TEST_SUITE(PickupSpawnTestSuite)
 
diff --git a/src/Tests/PickupSpawnTest.h b/src/Tests/HealthPickupTest.h
similarity index 100%
rename from src/Tests/PickupSpawnTest.h
rename to src/Tests/HealthPickupTest.h