diff --git a/anvil/sub_rig_templates/base.py b/anvil/sub_rig_templates/base.py
index 8d1591a..aeed406 100644
--- a/anvil/sub_rig_templates/base.py
+++ b/anvil/sub_rig_templates/base.py
@@ -61,7 +61,6 @@ def build_fk_chain(self, chain_start=None, chain_end=None, shape=None, duplicate
         chain = nt.HierarchyChain(chain_start, chain_end, duplicate=duplicate, parent=self.group_joints)
 
         # Ensure there are enough shapes in the shape list to pair with the chain
-
         controls = []
         last_node = parent or self.group_controls
         for node, shape in zip(chain, self.get_shape_list(len(chain), shape)):
@@ -72,6 +71,7 @@ def build_fk_chain(self, chain_start=None, chain_end=None, shape=None, duplicate
                                        meta_data=self.meta_data.merge(self.meta_data, meta_data, new=True),
                                        **kwargs)
             controls.append(control)
+            rt.dcc.connections.parent(control.connection_group, node, maintainOffset=True)
             last_node = control.connection_group
         return {cfg.CONTROL_TYPE: controls, cfg.JOINT_TYPE: chain}
 
diff --git a/tests/acceptance/test_build_hand.py b/tests/acceptance/test_build_hand.py
index d9cc349..9a39372 100644
--- a/tests/acceptance/test_build_hand.py
+++ b/tests/acceptance/test_build_hand.py
@@ -37,15 +37,11 @@ def from_template_file(cls, template_file, finger_start_joints=None, **kwargs):
 class TestBuildHand(TestHandBase):
     rig = None
 
-    # @classmethod
-    # def setUpClass(cls):
-    #    super(TestBuildHand, cls).setUpClass()
-    #    cls.rig = cls.from_template_file(cls.HAND_MERC, cls.HAND_MERC_JOINTS)
-
-    def setUp(self):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBuildHand, cls).setUpClass()
         try:
-            if self.rig is None:
-                self.rig = self.from_template_file(self.HAND_MERC, self.HAND_MERC_JOINTS)
+            cls.rig = cls.from_template_file(cls.HAND_MERC, cls.HAND_MERC_JOINTS)
         except IndexError:
             print_scene_tree()
 
diff --git a/tests/acceptance/test_skeleton_hand.fbx b/tests/acceptance/test_skeleton_hand.fbx
deleted file mode 100644
index 6f37aa3..0000000
Binary files a/tests/acceptance/test_skeleton_hand.fbx and /dev/null differ