Added VX22 short barrel and tested composition from randomly selected component