diff --git a/__tests__/commands/Attack.js b/__tests__/commands/Attack.js
index 66cd673..4b2841a 100644
--- a/__tests__/commands/Attack.js
+++ b/__tests__/commands/Attack.js
@@ -130,16 +130,81 @@ it('returns false ', () => {
 });
 
 // main function
-/*
-it('should abort with a message', () => {
+
+it('should abort with a message: no entry found', () => {
+    const reply = jest.fn(str => str);
+
     const message = {
-        reply: function (e) {
-            throw new Error(e);
-        },
+        reply: reply,
     };
-    const err = 'error';
     const handleAttack = rewireUtils.__get__('handleAttack');
-    expect(handleAttack(err)).toThrowError();
-    //expect(handleAttack(null, [])).toThrowError();
+    //expect(handleAttack(err)).toThrowError();
+    expect(handleAttack(null, [], { message: message })).toEqual(
+        'Sorry, für dich habe ich leider keinen Eintrag 😥'
+    );
+});
+
+it('should abort with a message: No such weapon', () => {
+    const reply = jest.fn(str => str);
+
+    const message = {
+        reply: reply,
+    };
+    const handleAttack = rewireUtils.__get__('handleAttack');
+    const args = [''];
+    expect(handleAttack(null, [{ character: {} }], { message: message, args: args })).toEqual(
+        'Diese Waffe gibt es nicht.'
+    );
+});
+
+it('complete run with melee weapon', () => {
+    const reply = jest.fn(str => str);
+
+    const message = {
+        reply: reply,
+    };
+    const character = {
+        attributes: [
+            { id: 'mut', level: 10 },
+            { id: 'fingerfertigkeit', level: 10 },
+            { id: 'klugheit', level: 10 },
+            { id: 'intuition', level: 10 },
+            { id: 'charisma', level: 10 },
+            { id: 'gewandtheit', level: 16 },
+            { id: 'konstitution', level: 10 },
+            { id: 'koerperkraft', level: 10 },
+        ],
+        combattechniques: [{ id: 'dolche', level: 8 }],
+    };
+    const handleAttack = rewireUtils.__get__('handleAttack');
+    const args = ['messer'];
+    expect(
+        handleAttack(null, [{ character: character }], { message: message, args: args })
+    ).toEqual(expect.any(String));
+});
+
+it('complete run with ranged weapon', () => {
+    const reply = jest.fn(str => str);
+
+    const message = {
+        reply: reply,
+    };
+    const character = {
+        attributes: [
+            { id: 'mut', level: 10 },
+            { id: 'fingerfertigkeit', level: 14 },
+            { id: 'klugheit', level: 10 },
+            { id: 'intuition', level: 10 },
+            { id: 'charisma', level: 10 },
+            { id: 'gewandtheit', level: 16 },
+            { id: 'konstitution', level: 10 },
+            { id: 'koerperkraft', level: 10 },
+        ],
+        combattechniques: [{ id: 'boegen', level: 8 }],
+    };
+    const handleAttack = rewireUtils.__get__('handleAttack');
+    const args = ['langbogen'];
+    expect(
+        handleAttack(null, [{ character: character }], { message: message, args: args })
+    ).toEqual(expect.any(String));
 });
-*/
diff --git a/commands/Attack.js b/commands/Attack.js
index ca868a6..915ff32 100644
--- a/commands/Attack.js
+++ b/commands/Attack.js
@@ -13,14 +13,16 @@ module.exports = {
 
     async exec(message, args) {
         try {
-            db.find({ user: message.author.tag }, (err, docs) => handleAttack(err, docs, message));
+            db.find({ user: message.author.tag }, (err, docs) =>
+                handleAttack(err, docs, { message: message, args: args })
+            );
         } catch (e) {
             throw e;
         }
     },
 };
 
-function handleAttack(err, docs, message) {
+function handleAttack(err, docs, { message: message, args: args }) {
     if (docs.length === 0) {
         return message.reply(findMessage('NOENTRY'));
     }
@@ -76,7 +78,11 @@ function handleAttack(err, docs, message) {
         Damage = AttackResult.DoubleDamage ? (Damage *= 2) : Damage;
 
         Reply += '\n\nHier aufklappen, wenn der Gegner nicht parieren/Ausweichen konnte:\n';
-        Reply += `|| ${Weapon.name} (${Weapon.dice}W6+${Weapon.diemodificator}) richtet ${Damage} schaden an.`;
+        Reply += `|| ${Weapon.name} (${Weapon.dice}W6+${
+            Weapon.diemodificator
+        }) richtet ${Damage} schaden an. ${
+            AttackBonus ? `(+${AttackBonus} Bonus auf Leiteigenschaft)` : ''
+        }`;
         Reply += '\nDeine 🎲: ` ' + DamageDice.join(',') + ' `.||\n';
     }
 
diff --git a/package.json b/package.json
index ae60e1d..8634d8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dsabot",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "",
   "main": "index.js",
   "scripts": {