Created WeaponServiceTest without Mock objects.
Edited Service objects
merge
merge