Grenades unit tests

Note that this MR contains already MR !8 (merged) - it got merged when I merged main into this branch because I wanted MR !7 (merged)...