Minor refactoring of Damage unit tests