From 5649559c6d876e4343c266119344dbc0674fa340 Mon Sep 17 00:00:00 2001
From: Michael Chisholm <chisholm@mitre.org>
Date: Wed, 24 Jul 2019 17:39:00 -0400
Subject: [PATCH] Removed some more hard-codings of v20 in the workbench test
 suite.

---
 stix2/test/test_workbench.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/stix2/test/test_workbench.py b/stix2/test/test_workbench.py
index fd62703..d946547 100644
--- a/stix2/test/test_workbench.py
+++ b/stix2/test/test_workbench.py
@@ -3,13 +3,14 @@ import os
 
 import stix2
 from stix2.workbench import (
-    _STIX_VID, AttackPattern, Campaign, CourseOfAction, ExternalReference,
-    FileSystemSource, Filter, Identity, Indicator, IntrusionSet, Malware,
-    MarkingDefinition, ObservedData, Relationship, Report, StatementMarking,
-    ThreatActor, Tool, Vulnerability, add_data_source, all_versions,
-    attack_patterns, campaigns, courses_of_action, create, get, identities,
-    indicators, intrusion_sets, malware, observed_data, query, reports, save,
-    set_default_created, set_default_creator, set_default_external_refs,
+    _STIX_VID, AttackPattern, Bundle, Campaign, CourseOfAction,
+    ExternalReference, File, FileSystemSource, Filter, Identity, Indicator,
+    IntrusionSet, Malware, MarkingDefinition, NTFSExt, ObservedData,
+    Relationship, Report, StatementMarking, ThreatActor, Tool, Vulnerability,
+    add_data_source, all_versions, attack_patterns, campaigns,
+    courses_of_action, create, get, identities, indicators, intrusion_sets,
+    malware, observed_data, query, reports, save, set_default_created,
+    set_default_creator, set_default_external_refs,
     set_default_object_marking_refs, threat_actors, tools, vulnerabilities,
 )
 
@@ -164,7 +165,7 @@ def test_workbench_get_all_vulnerabilities():
 
 def test_workbench_add_to_bundle():
     vuln = Vulnerability(**constants.VULNERABILITY_KWARGS)
-    bundle = stix2.v20.Bundle(vuln)
+    bundle = Bundle(vuln)
     assert bundle.objects[0].name == 'Heartbleed'
 
 
@@ -305,12 +306,12 @@ def test_default_object_marking_refs():
 
 
 def test_workbench_custom_property_object_in_observable_extension():
-    ntfs = stix2.v20.NTFSExt(
+    ntfs = NTFSExt(
         allow_custom=True,
         sid=1,
         x_foo='bar',
     )
-    artifact = stix2.v20.File(
+    artifact = File(
         name='test',
         extensions={'ntfs-ext': ntfs},
     )
@@ -327,7 +328,7 @@ def test_workbench_custom_property_object_in_observable_extension():
 
 
 def test_workbench_custom_property_dict_in_observable_extension():
-    artifact = stix2.v20.File(
+    artifact = File(
         allow_custom=True,
         name='test',
         extensions={