Renamed and moved WeaponTest to match what it test. Removed duplicate class