added arsenal extractor and tests