Keep MALWARE_KWARGS to a minimal set

...but use an additional set with a description for marking tests.

stix2/test/constants.py

@@ -55,6 +55,12 @@ INDICATOR_KWARGS = dict(
 MALWARE_KWARGS = dict(
     labels=['ransomware'],
     name="Cryptolocker",
+)
+
+# All required args for a Malware instance, plus some optional args
+MALWARE_MORE_KWARGS = dict(
+    labels=['ransomware'],
+    name="Cryptolocker",
     description="A ransomware related to ..."
 )
 

stix2/test/test_bundle.py

@@ -19,7 +19,6 @@ EXPECTED_BUNDLE = """{
         },
         {
             "created": "2017-01-01T12:34:56.000Z",
-            "description": "A ransomware related to ...",
             "id": "malware--00000000-0000-0000-0000-000000000002",
             "labels": [
                 "ransomware"

stix2/test/test_granular_markings.py

@@ -4,7 +4,7 @@ import pytest
 from stix2 import Malware, markings
 
 from .constants import FAKE_TIME, MALWARE_ID, MARKING_IDS
-from .constants import MALWARE_KWARGS as MALWARE_KWARGS_CONST
+from .constants import MALWARE_MORE_KWARGS as MALWARE_KWARGS_CONST
 
 """Tests for the Data Markings API."""