Combat dmg should be ok, fix tests.