improve weapon and firearm loot tests