eddy-geek
diff --git a/‎plotly/figure_factory/_facet_grid.py
Lines changed: 1 addition & 1 deletion b/‎plotly/figure_factory/_facet_grid.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎plotly/tests/test_core/test_graph_objs/test_figure.py
Lines changed: 2 additions & 10 deletions b/‎plotly/tests/test_core/test_graph_objs/test_figure.py
Lines changed: 2 additions & 10 deletions
diff --git a/‎plotly/tests/test_core/test_graph_objs/test_template.py
Lines changed: 2 additions & 7 deletions b/‎plotly/tests/test_core/test_graph_objs/test_template.py
Lines changed: 2 additions & 7 deletions
diff --git a/‎plotly/tests/test_core/test_graph_objs/test_to_ordered_dict.py
Lines changed: 2 additions & 8 deletions b/‎plotly/tests/test_core/test_graph_objs/test_to_ordered_dict.py
Lines changed: 2 additions & 8 deletions
@@ -3,7 +3,7 @@
 from plotly import exceptions, optional_imports
 import plotly.colors as clrs
 from plotly.figure_factory import utils
-from plotly.tools import make_subplots
+from plotly.subplots import make_subplots
 
 import math
 from numbers import Number
 
@@ -1,18 +1,10 @@
 from __future__ import absolute_import
 
-from unittest import TestCase
-
 import plotly.graph_objs as go
-import plotly.io as pio
-
-
-class FigureTest(TestCase):
+from plotly.tests.utils import TestCaseNoTemplate
 
-    def setUp(self):
-        pio.templates.default = None
 
-    def tearDown(self):
-        pio.templates.default = 'plotly'
+class FigureTest(TestCaseNoTemplate):
 
     def test_instantiation(self):
 
 
@@ -6,6 +6,7 @@
 
 import plotly.io as pio
 import plotly.graph_objs as go
+from plotly.tests.utils import TestCaseNoTemplate
 
 
 class TemplateTest(TestCase):
@@ -169,13 +170,7 @@ def test_template_iter(self):
         self.assertIn('test_template', set(pio.templates))
 
 
-class TestToTemplated(TestCase):
-
-    def setUp(self):
-        pio.templates.default = None
-
-    def tearDown(self):
-        pio.templates.default = 'plotly'
+class TestToTemplated(TestCaseNoTemplate):
 
     def test_move_layout_nested_properties(self):
         fig = go.Figure(layout={'font': {'family': 'Courier New'},
 
@@ -1,17 +1,11 @@
 from __future__ import absolute_import
 
-from unittest import TestCase
 import plotly.graph_objs as go
 from collections import OrderedDict
-import plotly.io as pio
+from plotly.tests.utils import TestCaseNoTemplate
 
 
-class FigureTest(TestCase):
-    def setUp(self):
-        pio.templates.default = None
-
-    def tearDown(self):
-        pio.templates.default = 'plotly'
+class FigureTest(TestCaseNoTemplate):
 
     def test_to_ordered_dict(self):