diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 12f81240b3..b99ec2871e 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -110,6 +110,7 @@
 			{"nick": "kingadami", "name": "Adam Winsor"},
 			{"nick": "kingbasil", "name": "Giannis Fafalios"},
 			{"nick": "lafferjm", "name": "Justin Lafferty"},
+			{"nick": "LeanderH", "name": "Leander Hemelhof"},
 			{"nick": "leper", "name": "Georg Kilzer"},
 			{"nick": "LittleDev"},
 			{"nick": "livingaftermidnight", "name": "Will Dull"},
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Damage.js b/binaries/data/mods/public/simulation/components/tests/test_Damage.js
new file mode 100644
index 0000000000..8a694384ab
--- /dev/null
+++ b/binaries/data/mods/public/simulation/components/tests/test_Damage.js
@@ -0,0 +1,100 @@
+Engine.LoadHelperScript("Damage.js");
+Engine.LoadHelperScript("Player.js");
+Engine.LoadHelperScript("Sound.js");
+Engine.LoadHelperScript("ValueModification.js");
+Engine.LoadComponentScript("interfaces/Attack.js");
+Engine.LoadComponentScript("interfaces/AttackDetection.js");
+Engine.LoadComponentScript("interfaces/AuraManager.js");
+Engine.LoadComponentScript("interfaces/DamageReceiver.js");
+Engine.LoadComponentScript("interfaces/Health.js");
+Engine.LoadComponentScript("interfaces/Loot.js");
+Engine.LoadComponentScript("interfaces/Player.js");
+Engine.LoadComponentScript("interfaces/Promotion.js");
+Engine.LoadComponentScript("interfaces/Sound.js");
+Engine.LoadComponentScript("interfaces/TechnologyManager.js");
+Engine.LoadComponentScript("interfaces/Timer.js");
+Engine.LoadComponentScript("Attack.js");
+Engine.LoadComponentScript("Timer.js");
+
+let cmpTimer = ConstructComponent(SYSTEM_ENTITY, "Timer");
+cmpTimer.OnUpdate({ turnLength: 1 });
+let attacker = 11;
+let atkPlayerEntity = 1;
+let attackerOwner = 6;
+let cmpAttack = ConstructComponent(attacker, "Attack", { "Ranged": { "ProjectileSpeed": 500, "Spread": 0.5, "MaxRange": 50, "MinRange": 0 } } );
+let damage = 5;
+let target = 21;
+let targetOwner = 7;
+let targetPos = new Vector3D(3, 0, 3);
+
+let type = "Ranged";
+let damageTaken = false;
+
+cmpAttack.GetAttackStrengths = (type) => ({ "hack": 0, "pierce": 0, "crush": damage });
+cmpAttack.GetAttackBonus = (type, target) => 1.0; 
+
+AddMock(atkPlayerEntity, IID_Player, {
+	GetEnemies: () => [targetOwner],
+});
+
+AddMock(SYSTEM_ENTITY, IID_PlayerManager, {
+	GetPlayerByID: (id) => atkPlayerEntity,
+	GetAllPlayerEntities: () => [attackerOwner, targetOwner],
+});
+
+AddMock(SYSTEM_ENTITY, IID_RangeManager, { 
+	ExecuteQueryAroundPos: () => [target], 
+	GetElevationAdaptedRange: (pos, rot, max, bonus, a) => max, 
+});
+
+AddMock(SYSTEM_ENTITY, IID_ProjectileManager, {
+	RemoveProjectile: () => {},
+	LaunchProjectileAtPoint: (ent, pos, speed, gravity) => {},
+});
+
+AddMock(target, IID_Position, {
+	GetPosition: () => targetPos,
+	GetPreviousPosition: () => targetPos,
+	GetPosition2D: () => new Vector2D(3, 3),
+	IsInWorld: () => true,
+});
+
+AddMock(target, IID_Health, {});
+ 
+AddMock(target, IID_DamageReceiver, {
+	TakeDamage: (hack, pierce, crush) => { damageTaken = true; return { "killed": false, "change": -crush }; },
+});
+
+Engine.PostMessage = function(ent, iid, message)
+{
+	TS_ASSERT_UNEVAL_EQUALS({ "attacker": attacker, "target": target, "type": type, "damage": damage }, message);
+};
+
+AddMock(target, IID_Footprint, {
+	GetShape: () => ({ "type": "circle", "radius": 20 }),
+});
+
+AddMock(attacker, IID_Ownership, {
+	GetOwner: () => attackerOwner,
+});
+
+AddMock(attacker, IID_Position, { 
+	GetPosition: () => new Vector3D(2, 0, 3),
+	GetRotation: () => new Vector3D(1, 2, 3),
+	IsInWorld: () => true,
+});
+
+function TestDamage()
+{
+	cmpTimer.OnUpdate({ turnLength: 1 });
+	TS_ASSERT(damageTaken);
+	damageTaken = false;
+}
+
+cmpAttack.PerformAttack("Ranged", target);
+TestDamage();
+
+// Check for damage still being dealt if the attacker dies
+cmpAttack.PerformAttack("Ranged", target);
+Engine.DestroyEntity(attacker);
+TestDamage();