Added and tested armor-type parsing