Fixed wrongly calculated armorweight
Added Tests to verify that the weight is correctly calculated