KD - added armory which is read in from a yaml file.  Added more equipment service tests