Rename any instance of scene layer or render layer in code with view layer

The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.

* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started

Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.

Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.

Reviewers: campbellbarton, sergey

Differential Revision: https://developer.blender.org/D2927

115 files changed, 0 insertions, 6951 deletions

diff --git a/tests/python/render_layer/CMakeLists.txt b/tests/python/render_layer/CMakeLists.txt
deleted file mode 100644
index 5ff985073e3..00000000000
--- a/tests/python/render_layer/CMakeLists.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Contributor(s): Jacques Beaurain, Dalai Felinto.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# --env-system-scripts allows to run without the install target. 
-
-# Use '--write-blend=/tmp/test.blend' to view output
-
-set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests)
-set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
-
-# ugh, any better way to do this on testing only?
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
-
-#~	if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~		message(FATAL_ERROR "CMake test directory not found!")
-#~	endif()
-
-# all calls to blender use this
-if(APPLE)
-	if(${CMAKE_GENERATOR} MATCHES "Xcode")
-		set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/Debug/blender.app/Contents/MacOS/blender)
-	else()
-		set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender.app/Contents/MacOS/blender)
-	endif()
-else()
-	set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender)
-endif()
-
-# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no 
-set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
-
-
-# ------------------------------------------------------------------------------
-
-macro(RENDER_LAYER_TEST test_name)
-	# Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import
-	# things from render_layer_common.py
-	add_test(render_layer_${test_name} ${TEST_BLENDER_EXE}
-		--python-expr "import sys; sys.path.append('${CMAKE_CURRENT_LIST_DIR}')"
-		--python-exit-code 1
-		--python ${CMAKE_CURRENT_LIST_DIR}/test_${test_name}.py --
-		--testdir="${TEST_SRC_DIR}/layers"
-	)
-endmacro()
-
-RENDER_LAYER_TEST(active_collection)
-RENDER_LAYER_TEST(collection_rename)
-RENDER_LAYER_TEST(evaluation_render_settings_a)
-RENDER_LAYER_TEST(evaluation_render_settings_b)
-RENDER_LAYER_TEST(evaluation_render_settings_c)
-RENDER_LAYER_TEST(evaluation_render_settings_d)
-RENDER_LAYER_TEST(evaluation_render_settings_e)
-RENDER_LAYER_TEST(evaluation_render_settings_f)
-RENDER_LAYER_TEST(evaluation_render_settings_g)
-RENDER_LAYER_TEST(evaluation_render_settings_h)
-RENDER_LAYER_TEST(evaluation_render_settings_i)
-RENDER_LAYER_TEST(evaluation_visibility_a)
-RENDER_LAYER_TEST(evaluation_visibility_b)
-RENDER_LAYER_TEST(evaluation_visibility_c)
-RENDER_LAYER_TEST(evaluation_visibility_d)
-RENDER_LAYER_TEST(evaluation_visibility_e)
-RENDER_LAYER_TEST(evaluation_visibility_f)
-RENDER_LAYER_TEST(evaluation_visibility_g)
-RENDER_LAYER_TEST(evaluation_visibility_h)
-RENDER_LAYER_TEST(evaluation_visibility_i)
-RENDER_LAYER_TEST(evaluation_selectability_a)
-RENDER_LAYER_TEST(evaluation_selectability_b)
-RENDER_LAYER_TEST(evaluation_selectability_c)
-RENDER_LAYER_TEST(evaluation_selectability_d)
-RENDER_LAYER_TEST(evaluation_selectability_e)
-RENDER_LAYER_TEST(evaluation_selectability_f)
-RENDER_LAYER_TEST(object_add_cylinder)
-RENDER_LAYER_TEST(object_add_empty)
-RENDER_LAYER_TEST(object_add_torus)
-RENDER_LAYER_TEST(object_add_no_collection_cylinder)
-RENDER_LAYER_TEST(object_add_no_collection_empty)
-RENDER_LAYER_TEST(object_add_no_collection_torus)
-RENDER_LAYER_TEST(object_copy)
-RENDER_LAYER_TEST(object_delete_a)
-RENDER_LAYER_TEST(object_delete_b)
-RENDER_LAYER_TEST(object_link_a)
-RENDER_LAYER_TEST(object_link_b)
-RENDER_LAYER_TEST(object_link_c)
-RENDER_LAYER_TEST(operator_context)
-RENDER_LAYER_TEST(move_above_below_scene_collection_a)
-RENDER_LAYER_TEST(move_above_below_scene_collection_b)
-RENDER_LAYER_TEST(move_above_below_scene_collection_c)
-RENDER_LAYER_TEST(move_above_below_scene_collection_d)
-RENDER_LAYER_TEST(move_above_below_scene_collection_e)
-RENDER_LAYER_TEST(move_above_below_scene_collection_f)
-RENDER_LAYER_TEST(move_above_below_scene_collection_g)
-RENDER_LAYER_TEST(move_above_below_scene_collection_h)
-RENDER_LAYER_TEST(move_above_below_scene_collection_i)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_a)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_b)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_c)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_d)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_e)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_f)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_g)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_h)
-RENDER_LAYER_TEST(move_above_below_scene_collection_sync_i)
-RENDER_LAYER_TEST(move_into_scene_collection_a)
-RENDER_LAYER_TEST(move_into_scene_collection_b)
-RENDER_LAYER_TEST(move_into_scene_collection_c)
-RENDER_LAYER_TEST(move_into_scene_collection_d)
-RENDER_LAYER_TEST(move_into_scene_collection_e)
-RENDER_LAYER_TEST(move_into_scene_collection_f)
-RENDER_LAYER_TEST(move_into_scene_collection_g)
-RENDER_LAYER_TEST(move_into_scene_collection_h)
-RENDER_LAYER_TEST(move_into_scene_collection_i)
-RENDER_LAYER_TEST(move_into_scene_collection_j)
-RENDER_LAYER_TEST(move_into_scene_collection_k)
-RENDER_LAYER_TEST(move_into_scene_collection_l)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_a)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_b)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_c)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_d)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_e)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_f)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_g)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_h)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_i)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_j)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_k)
-RENDER_LAYER_TEST(move_into_scene_collection_sync_l)
-RENDER_LAYER_TEST(move_above_below_layer_collection_a)
-RENDER_LAYER_TEST(move_above_below_layer_collection_b)
-RENDER_LAYER_TEST(move_above_below_layer_collection_c)
-RENDER_LAYER_TEST(move_above_below_layer_collection_d)
-RENDER_LAYER_TEST(move_above_below_layer_collection_e)
-RENDER_LAYER_TEST(move_above_below_layer_collection_f)
-RENDER_LAYER_TEST(move_above_below_layer_collection_g)
-RENDER_LAYER_TEST(move_above_below_layer_collection_h)
-RENDER_LAYER_TEST(move_above_below_layer_collection_i)
-RENDER_LAYER_TEST(move_above_below_layer_collection_j)
-RENDER_LAYER_TEST(move_above_below_layer_collection_k)
-RENDER_LAYER_TEST(move_above_below_layer_collection_l)
-RENDER_LAYER_TEST(move_into_layer_collection_a)
-RENDER_LAYER_TEST(move_into_layer_collection_b)
-RENDER_LAYER_TEST(move_into_layer_collection_c)
-RENDER_LAYER_TEST(move_into_layer_collection_d)
-RENDER_LAYER_TEST(move_into_layer_collection_e)
-RENDER_LAYER_TEST(move_into_layer_collection_f)
-RENDER_LAYER_TEST(move_into_layer_collection_g)
-RENDER_LAYER_TEST(move_into_layer_collection_h)
-RENDER_LAYER_TEST(move_into_layer_collection_i)
-RENDER_LAYER_TEST(move_into_layer_collection_j)
-RENDER_LAYER_TEST(layer_linking)
-RENDER_LAYER_TEST(layer_syncing)
-RENDER_LAYER_TEST(scene_copy_a)
-RENDER_LAYER_TEST(scene_copy_b)
-RENDER_LAYER_TEST(scene_copy_c)
-RENDER_LAYER_TEST(scene_copy_d)
-RENDER_LAYER_TEST(scene_copy_e)
-RENDER_LAYER_TEST(scene_copy_f)
-RENDER_LAYER_TEST(scene_delete)
-RENDER_LAYER_TEST(scene_write_read)
diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
deleted file mode 100644
index 7e8cbf988c8..00000000000
--- a/tests/python/render_layer/render_layer_common.py
+++ /dev/null
@@ -1,810 +0,0 @@
-import unittest
-
-# ############################################################
-# Layer Collection Crawler
-# ############################################################
-
-
-def listbase_iter(data, struct, listbase):
-    element = data.get_pointer((struct, listbase, b'first'))
-    while element is not None:
-        yield element
-        element = element.get_pointer(b'next')
-
-
-def linkdata_iter(collection, data):
-    element = collection.get_pointer((data, b'first'))
-    while element is not None:
-        yield element
-        element = element.get_pointer(b'next')
-
-
-def get_layer_collection(layer_collection):
-    data = {}
-    flag = layer_collection.get(b'flag')
-
-    data['is_visible'] = (flag & (1 << 0)) != 0
-    data['is_selectable'] = (flag & (1 << 1)) != 0
-    data['is_disabled'] = (flag & (1 << 2)) != 0
-
-    scene_collection = layer_collection.get_pointer(b'scene_collection')
-    if scene_collection is None:
-        name = 'Fail!'
-    else:
-        name = scene_collection.get(b'name')
-    data['name'] = name
-
-    objects = []
-    for link in linkdata_iter(layer_collection, b'object_bases'):
-        ob_base = link.get_pointer(b'data')
-        ob = ob_base.get_pointer(b'object')
-        objects.append(ob.get((b'id', b'name'))[2:])
-    data['objects'] = objects
-
-    collections = {}
-    for nested_layer_collection in linkdata_iter(layer_collection, b'layer_collections'):
-        subname, subdata = get_layer_collection(nested_layer_collection)
-        collections[subname] = subdata
-    data['collections'] = collections
-
-    return name, data
-
-
-def get_layer(scene, layer):
-    data = {}
-    name = layer.get(b'name')
-
-    data['name'] = name
-    data['engine'] = scene.get((b'view_render', b'engine_id'))
-
-    active_base = layer.get_pointer(b'basact')
-    if active_base:
-        ob = active_base.get_pointer(b'object')
-        data['active_object'] = ob.get((b'id', b'name'))[2:]
-    else:
-        data['active_object'] = ""
-
-    objects = []
-    for link in linkdata_iter(layer, b'object_bases'):
-        ob = link.get_pointer(b'object')
-        objects.append(ob.get((b'id', b'name'))[2:])
-    data['objects'] = objects
-
-    collections = {}
-    for layer_collection in linkdata_iter(layer, b'layer_collections'):
-        subname, subdata = get_layer_collection(layer_collection)
-        collections[subname] = subdata
-    data['collections'] = collections
-
-    return name, data
-
-
-def get_layers(scene):
-    """Return all the render layers and their data"""
-    layers = {}
-    for layer in linkdata_iter(scene, b'render_layers'):
-        name, data = get_layer(scene, layer)
-        layers[name] = data
-    return layers
-
-
-def get_scene_collection_objects(collection, listbase):
-    objects = []
-    for link in linkdata_iter(collection, listbase):
-        ob = link.get_pointer(b'data')
-        if ob is None:
-            name = 'Fail!'
-        else:
-            name = ob.get((b'id', b'name'))[2:]
-        objects.append(name)
-    return objects
-
-
-def get_scene_collection(collection):
-    """"""
-    data = {}
-    name = collection.get(b'name')
-
-    data['name'] = name
-    data['filter'] = collection.get(b'filter')
-
-    data['objects'] = get_scene_collection_objects(collection, b'objects')
-    data['filter_objects'] = get_scene_collection_objects(collection, b'filter_objects')
-
-    collections = {}
-    for nested_collection in linkdata_iter(collection, b'scene_collections'):
-        subname, subdata = get_scene_collection(nested_collection)
-        collections[subname] = subdata
-    data['collections'] = collections
-
-    return name, data
-
-
-def get_scene_collections(scene):
-    """Return all the scene collections ahd their data"""
-    master_collection = scene.get_pointer(b'collection')
-    return get_scene_collection(master_collection)
-
-
-def query_scene(filepath, name, callbacks):
-    """Return the equivalent to bpy.context.scene"""
-    from io_blend_utils.blend import blendfile
-
-    with blendfile.open_blend(filepath) as blend:
-        scenes = [block for block in blend.blocks if block.code == b'SC']
-        for scene in scenes:
-            if scene.get((b'id', b'name'))[2:] != name:
-                continue
-
-            return [callback(scene) for callback in callbacks]
-
-
-# ############################################################
-# Utils
-# ############################################################
-
-def dump(data):
-    import json
-    return json.dumps(
-            data,
-            sort_keys=True,
-            indent=4,
-            separators=(',', ': '),
-            )
-
-
-# ############################################################
-# Tests
-# ############################################################
-
-PDB = False
-DUMP_DIFF = True
-UPDATE_DIFF = False # HACK used to update tests when something change
-
-
-def compare_files(file_a, file_b):
-    import filecmp
-
-    if not filecmp.cmp(
-            file_a,
-            file_b):
-
-        if DUMP_DIFF:
-            import subprocess
-            subprocess.call(["diff", "-u", file_a, file_b])
-
-        if UPDATE_DIFF:
-            import subprocess
-            subprocess.call(["cp", "-u", file_a, file_b])
-
-
-        if PDB:
-            import pdb
-            print("Files differ:", file_a, file_b)
-            pdb.set_trace()
-
-        return False
-
-    return True
-
-
-class RenderLayerTesting(unittest.TestCase):
-    _test_simple = False
-    _extra_arguments = []
-
-    @classmethod
-    def setUpClass(cls):
-        """Runs once"""
-        cls.pretest_parsing()
-
-    @classmethod
-    def get_root(cls):
-        """
-        return the folder with the test files
-        """
-        arguments = {}
-        for argument in cls._extra_arguments:
-            name, value = argument.split('=')
-            cls.assertTrue(name and name.startswith("--"), "Invalid argument \"{0}\"".format(argument))
-            cls.assertTrue(value, "Invalid argument \"{0}\"".format(argument))
-            arguments[name[2:]] = value.strip('"')
-
-        return arguments.get('testdir')
-
-    @classmethod
-    def pretest_parsing(cls):
-        """
-        Test if the arguments are properly set, and store ROOT
-        name has extra _ because we need this test to run first
-        """
-        root = cls.get_root()
-        cls.assertTrue(root, "Testdir not set")
-
-    def setUp(self):
-        """Runs once per test"""
-        import bpy
-        bpy.ops.wm.read_factory_settings()
-
-    def path_exists(self, filepath):
-        import os
-        self.assertTrue(
-                os.path.exists(filepath),
-                "Test file \"{0}\" not found".format(filepath))
-
-    def do_object_add(self, filepath_json, add_mode):
-        """
-        Testing for adding objects and see if they
-        go to the right collection
-        """
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-
-            # open file
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-
-            # create sub-collections
-            three_b = bpy.data.objects.get('T.3b')
-            three_c = bpy.data.objects.get('T.3c')
-
-            scene = bpy.context.scene
-            subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-            scorpion = subzero.collections.new('scorpion')
-            subzero.objects.link(three_b)
-            scorpion.objects.link(three_c)
-            layer = scene.render_layers.new('Fresh new Layer')
-            layer.collections.link(subzero)
-
-            # change active collection
-            layer.collections.active_index = 3
-            self.assertEqual(layer.collections.active.name, 'scorpion', "Run: test_syncing_object_add")
-
-            # change active layer
-            override = bpy.context.copy()
-            override["render_layer"] = layer
-            override["scene_collection"] = layer.collections.active.collection
-
-            # add new objects
-            if add_mode == 'EMPTY':
-                bpy.ops.object.add(override)  # 'Empty'
-
-            elif add_mode == 'CYLINDER':
-                bpy.ops.mesh.primitive_cylinder_add(override)  # 'Cylinder'
-
-            elif add_mode == 'TORUS':
-                bpy.ops.mesh.primitive_torus_add(override)  # 'Torus'
-
-            # save file
-            filepath_objects = os.path.join(dirpath, 'objects.blend')
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_objects)
-
-            # get the generated json
-            datas = query_scene(filepath_objects, 'Main', (get_scene_collections, get_layers))
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_objects_json = os.path.join(dirpath, "objects.json")
-            with open(filepath_objects_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_objects_json,
-                filepath_json,
-                ),
-                "Scene dump files differ")
-
-    def do_object_add_no_collection(self, add_mode):
-        """
-        Test for adding objects when no collection
-        exists in render layer
-        """
-        import bpy
-
-        # empty layer of collections
-
-        layer = bpy.context.render_layer
-        while layer.collections:
-            layer.collections.unlink(layer.collections[0])
-
-        # add new objects
-        if add_mode == 'EMPTY':
-            bpy.ops.object.add()  # 'Empty'
-
-        elif add_mode == 'CYLINDER':
-            bpy.ops.mesh.primitive_cylinder_add()  # 'Cylinder'
-
-        elif add_mode == 'TORUS':
-            bpy.ops.mesh.primitive_torus_add()  # 'Torus'
-
-        self.assertEqual(len(layer.collections), 1, "New collection not created")
-        collection = layer.collections[0]
-        self.assertEqual(len(collection.objects), 1, "New collection is empty")
-
-    def do_object_link(self, master_collection):
-        import bpy
-        self.assertEqual(master_collection.name, "Master Collection")
-        self.assertEqual(master_collection, bpy.context.scene.master_collection)
-        master_collection.objects.link(bpy.data.objects.new('object', None))
-
-    def do_scene_copy(self, filepath_json_reference, copy_mode, data_callbacks):
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-
-            (self.path_exists(f) for f in (
-                filepath_layers,
-                filepath_json_reference,
-                ))
-
-            filepath_saved = os.path.join(dirpath, '{0}.blend'.format(copy_mode))
-            filepath_json = os.path.join(dirpath, "{0}.json".format(copy_mode))
-
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-            bpy.ops.scene.new(type=copy_mode)
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_saved)
-
-            datas = query_scene(filepath_saved, 'Main.001', data_callbacks)
-            self.assertTrue(datas, "Data is not valid")
-
-            with open(filepath_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_json,
-                filepath_json_reference,
-                ),
-                "Scene copy \"{0}\" test failed".format(copy_mode.title()))
-
-    def do_object_delete(self, del_mode):
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-            filepath_reference_json = os.path.join(ROOT, 'layers_object_delete.json')
-
-            # open file
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-
-            # create sub-collections
-            three_b = bpy.data.objects.get('T.3b')
-            three_d = bpy.data.objects.get('T.3d')
-
-            scene = bpy.context.scene
-
-            # mangle the file a bit with some objects linked across collections
-            subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-            scorpion = subzero.collections.new('scorpion')
-            subzero.objects.link(three_d)
-            scorpion.objects.link(three_b)
-            scorpion.objects.link(three_d)
-
-            # object to delete
-            ob = three_d
-
-            # delete object
-            if del_mode == 'DATA':
-                bpy.data.objects.remove(ob, do_unlink=True)
-
-            elif del_mode == 'OPERATOR':
-                bpy.context.scene.update()  # update depsgraph
-                bpy.ops.object.select_all(action='DESELECT')
-                ob.select_set(action='SELECT')
-                self.assertTrue(ob.select_get())
-                bpy.ops.object.delete()
-
-            # save file
-            filepath_generated = os.path.join(dirpath, 'generated.blend')
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_generated)
-
-            # get the generated json
-            datas = query_scene(filepath_generated, 'Main', (get_scene_collections, get_layers))
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_generated_json = os.path.join(dirpath, "generated.json")
-            with open(filepath_generated_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_generated_json,
-                filepath_reference_json,
-                ),
-                "Scene dump files differ")
-
-    def do_visibility_object_add(self, add_mode):
-        import bpy
-
-        scene = bpy.context.scene
-
-        # delete all objects of the file
-        for ob in bpy.data.objects:
-            bpy.data.objects.remove(ob, do_unlink=True)
-
-        # real test
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-
-        scene_collection = scene.master_collection.collections.new("Collection")
-        layer.collections.link(scene_collection)
-
-        bpy.context.scene.update()  # update depsgraph
-
-        self.assertEqual(len(bpy.data.objects), 0)
-
-        # add new objects
-        if add_mode == 'EMPTY':
-            bpy.ops.object.add()  # 'Empty'
-
-        elif add_mode == 'CYLINDER':
-            bpy.ops.mesh.primitive_cylinder_add()  # 'Cylinder'
-
-        elif add_mode == 'TORUS':
-            bpy.ops.mesh.primitive_torus_add()  # 'Torus'
-
-        self.assertEqual(len(bpy.data.objects), 1)
-
-        new_ob = bpy.data.objects[0]
-        self.assertTrue(new_ob.visible_get(), "Object should be visible")
-
-    def cleanup_tree(self):
-        """
-        Remove any existent layer and collections,
-        leaving only the one render_layer we can't remove
-        """
-        import bpy
-        scene = bpy.context.scene
-        while len(scene.render_layers) > 1:
-            scene.render_layers.remove(scene.render_layers[1])
-
-        layer = scene.render_layers[0]
-        while layer.collections:
-            layer.collections.unlink(layer.collections[0])
-
-        master_collection = scene.master_collection
-        while master_collection.collections:
-            master_collection.collections.remove(master_collection.collections[0])
-
-    def rename_collections(self, collection=None):
-        """
-        Rename 'Collection 1' to '1'
-        """
-        def strip_name(collection):
-            import re
-            if collection.name.startswith("Default Collection"):
-                collection.name = '1'
-            else:
-                collection.name = re.findall(r'\d+', collection.name)[0]
-
-        if collection is None:
-            import bpy
-            collection = bpy.context.scene.master_collection
-
-        for nested_collection in collection.collections:
-            strip_name(nested_collection)
-            self.rename_collections(nested_collection)
-
-
-class MoveSceneCollectionTesting(RenderLayerTesting):
-    """
-    To be used by tests of render_layer_move_into_scene_collection
-    """
-    def get_initial_scene_tree_map(self):
-        collections_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return collections_map
-
-    def build_scene_tree(self, tree_map, collection=None, ret_dict=None):
-        """
-        Returns a flat dictionary with new scene collections
-        created from a nested tuple of nested tuples (name, tuple)
-        """
-        import bpy
-
-        if collection is None:
-            collection = bpy.context.scene.master_collection
-
-        if ret_dict is None:
-            ret_dict = {collection.name: collection}
-            self.assertEqual(collection.name, "Master Collection")
-
-        for name, nested_collections in tree_map:
-            new_collection = collection.collections.new(name)
-            ret_dict[name] = new_collection
-
-            if nested_collections:
-                self.build_scene_tree(nested_collections, new_collection, ret_dict)
-
-        return ret_dict
-
-    def setup_tree(self):
-        """
-        Cleanup file, and populate it with class scene tree map
-        """
-        self.cleanup_tree()
-        self.assertTrue(
-                hasattr(self, "get_initial_scene_tree_map"),
-                "Test class has no get_initial_scene_tree_map method implemented")
-
-        return self.build_scene_tree(self.get_initial_scene_tree_map())
-
-    def get_scene_tree_map(self, collection=None, ret_list=None):
-        """
-        Extract the scene collection tree from scene
-        Return as a nested list of nested lists (name, list)
-        """
-        import bpy
-
-        if collection is None:
-            scene = bpy.context.scene
-            collection = scene.master_collection
-
-        if ret_list is None:
-            ret_list = []
-
-        for nested_collection in collection.collections:
-            new_collection = [nested_collection.name, None]
-            ret_list.append(new_collection)
-
-            if nested_collection.collections:
-                new_collection[1] = list()
-                self.get_scene_tree_map(nested_collection, new_collection[1])
-
-        return ret_list
-
-    def compare_tree_maps(self):
-        """
-        Compare scene with expected (class defined) data
-        """
-        self.assertEqual(self.get_scene_tree_map(), self.get_reference_scene_tree_map())
-
-
-class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting):
-    """
-    To be used by tests of render_layer_move_into_scene_collection_sync
-    """
-    def get_initial_layers_tree_map(self):
-        layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return layers_map
-
-    def get_reference_layers_tree_map(self):
-        """
-        For those classes we don't expect any changes in the layer tree
-        """
-        return self.get_initial_layers_tree_map()
-
-    def setup_tree(self):
-        tree = super(MoveSceneCollectionSyncTesting, self).setup_tree()
-
-        import bpy
-        scene = bpy.context.scene
-
-        self.assertTrue(
-                hasattr(self, "get_initial_layers_tree_map"),
-                "Test class has no get_initial_layers_tree_map method implemented")
-
-        layers_map = self.get_initial_layers_tree_map()
-
-        for layer_name, collections_names in layers_map:
-            layer = scene.render_layers.new(layer_name)
-            layer.collections.unlink(layer.collections[0])
-
-            for collection_name in collections_names:
-                layer.collections.link(tree[collection_name])
-
-        return tree
-
-    def compare_tree_maps(self):
-        """
-        Compare scene with expected (class defined) data
-        """
-        super(MoveSceneCollectionSyncTesting, self).compare_tree_maps()
-
-        import bpy
-        scene = bpy.context.scene
-        layers_map = self.get_reference_layers_tree_map()
-
-        for layer_name, collections_names in layers_map:
-            layer = scene.render_layers.get(layer_name)
-            self.assertTrue(layer)
-            self.assertEqual(len(collections_names), len(layer.collections))
-
-            for i, collection_name in enumerate(collections_names):
-                self.assertEqual(collection_name, layer.collections[i].name)
-                self.verify_collection_tree(layer.collections[i])
-
-    def verify_collection_tree(self, layer_collection):
-        """
-        Check if the LayerCollection mimics the SceneLayer tree
-        """
-        scene_collection = layer_collection.collection
-        self.assertEqual(len(layer_collection.collections), len(scene_collection.collections))
-
-        for i, nested_collection in enumerate(layer_collection.collections):
-            self.assertEqual(nested_collection.collection.name, scene_collection.collections[i].name)
-            self.assertEqual(nested_collection.collection, scene_collection.collections[i])
-            self.verify_collection_tree(nested_collection)
-
-
-class MoveLayerCollectionTesting(MoveSceneCollectionSyncTesting):
-    """
-    To be used by tests of render_layer_move_into_layer_collection
-    """
-    def parse_move(self, path, sep='.'):
-        """
-        convert 'Layer 1.C.2' into:
-        bpy.context.scene.render_layers['Layer 1'].collections['C'].collections['2']
-        """
-        import bpy
-
-        paths = path.split(sep)
-        layer = bpy.context.scene.render_layers[paths[0]]
-        collections = layer.collections
-
-        for subpath in paths[1:]:
-            collection = collections[subpath]
-            collections = collection.collections
-
-        return collection
-
-    def move_into(self, src, dst):
-        layer_collection_src = self.parse_move(src)
-        layer_collection_dst = self.parse_move(dst)
-        return layer_collection_src.move_into(layer_collection_dst)
-
-    def move_above(self, src, dst):
-        layer_collection_src = self.parse_move(src)
-        layer_collection_dst = self.parse_move(dst)
-        return layer_collection_src.move_above(layer_collection_dst)
-
-    def move_below(self, src, dst):
-        layer_collection_src = self.parse_move(src)
-        layer_collection_dst = self.parse_move(dst)
-        return layer_collection_src.move_below(layer_collection_dst)
-
-
-class Clay:
-    def __init__(self, extra_kid_layer=False):
-        import bpy
-
-        self._scene = bpy.context.scene
-        self._layer = self._fresh_layer()
-        self._object = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        # update depsgraph
-        self._scene.update()
-
-        scene_collection_grandma = self._scene.master_collection.collections.new("Grandma")
-        scene_collection_mom = scene_collection_grandma.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-        scene_collection_kid.objects.link(self._object)
-
-        layer_collection_grandma = self._layer.collections.link(scene_collection_grandma)
-        layer_collection_mom = layer_collection_grandma.collections[0]
-        layer_collection_kid = layer_collection_mom.collections[0]
-
-        # store the variables
-        self._scene_collections = {
-                'grandma': scene_collection_grandma,
-                'mom': scene_collection_mom,
-                'kid': scene_collection_kid,
-                }
-        self._layer_collections = {
-                'grandma': layer_collection_grandma,
-                'mom': layer_collection_mom,
-                'kid': layer_collection_kid,
-                }
-
-        if extra_kid_layer:
-            layer_collection_extra = self._layer.collections.link(scene_collection_kid)
-            self._layer_collections['extra'] = layer_collection_extra
-
-        self._update()
-
-    def _fresh_layer(self):
-        import bpy
-
-        # remove all other objects
-        while bpy.data.objects:
-            bpy.data.objects.remove(bpy.data.objects[0])
-
-        # remove all the other collections
-        while self._scene.master_collection.collections:
-            self._scene.master_collection.collections.remove(
-                    self._scene.master_collection.collections[0])
-
-        layer = self._scene.render_layers.new('Evaluation Test')
-        layer.collections.unlink(layer.collections[0])
-        self._scene.render_layers.active = layer
-        bpy.context.workspace.render_layer = layer
-
-        # remove all other layers
-        for layer_iter in self._scene.render_layers:
-            if layer_iter != layer:
-                self._scene.render_layers.remove(layer_iter)
-
-        return layer
-
-    def _update(self):
-        """
-        Force depsgrpah evaluation
-        and update pointers to IDProperty collections
-        """
-        ENGINE = 'BLENDER_CLAY'
-
-        self._scene.update()  # update depsgraph
-        self._layer.update()  # flush depsgraph evaluation
-
-        # change scene settings
-        self._properties = {
-                'scene': self._scene.collection_properties[ENGINE],
-                'object': self._object.collection_properties[ENGINE],
-                }
-
-        for key, value in self._layer_collections.items():
-            self._properties[key] = self._layer_collections[key].engine_overrides[ENGINE]
-
-    def get(self, name, data_path):
-        self._update()
-        return getattr(self._properties[name], data_path)
-
-    def set(self, name, data_path, value):
-        self._update()
-        self._properties[name].use(data_path)
-        setattr(self._properties[name], data_path, value)
-
-
-def setup_extra_arguments(filepath):
-    """
-    Create a value which is assigned to: ``UnitTesting._extra_arguments``
-    """
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [filepath] + extra_arguments[1:]
-
-    return extra_arguments
diff --git a/tests/python/render_layer/test_active_collection.py b/tests/python/render_layer/test_active_collection.py
deleted file mode 100644
index 0094400f2a5..00000000000
--- a/tests/python/render_layer/test_active_collection.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_active_collection(self):
-        """
-        See if active collection index is working
-        layer.collections.active_index works recursively
-        """
-        import bpy
-        import os
-
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-
-        # open file
-        bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-        self.rename_collections()
-
-        # create sub-collections
-        three_b = bpy.data.objects.get('T.3b')
-        three_c = bpy.data.objects.get('T.3c')
-
-        scene = bpy.context.scene
-        subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-        scorpion = subzero.collections.new('scorpion')
-        subzero.objects.link(three_b)
-        scorpion.objects.link(three_c)
-        layer = scene.render_layers.new('Fresh new Layer')
-        layer.collections.link(subzero)
-
-        lookup = [
-                'Master Collection',
-                '1',
-                'sub-zero',
-                'scorpion',
-                '2',
-                '3',
-                '4',
-                '5',
-                'sub-zero',
-                'scorpion']
-
-        for i, name in enumerate(lookup):
-            layer.collections.active_index = i
-            self.assertEqual(
-                    name, layer.collections.active.name,
-                    "Collection index mismatch: [{0}] : {1} != {2}".format(
-                        i, name, layer.collections.active.name))
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_collection_rename.py b/tests/python/render_layer/test_collection_rename.py
deleted file mode 100644
index 5cab6c10102..00000000000
--- a/tests/python/render_layer/test_collection_rename.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def setup_family(self):
-        import bpy
-        scene = bpy.context.scene
-
-        # Just add a bunch of collections on which we can do various tests.
-        grandma = scene.master_collection.collections.new('grandma')
-        grandpa = scene.master_collection.collections.new('grandpa')
-        mom = grandma.collections.new('mom')
-        son = mom.collections.new('son')
-        daughter = mom.collections.new('daughter')
-        uncle = grandma.collections.new('uncle')
-        cousin = uncle.collections.new('cousin')
-
-        lookup = {c.name: c for c in (grandma, grandpa, mom, son, daughter, uncle, cousin)}
-        return lookup
-
-    def test_rename_a(self):
-        family = self.setup_family()
-
-        family['mom'].name = family['daughter'].name
-        self.assertNotEqual(family['mom'].name, family['daughter'].name)
-
-    def test_rename_b(self):
-        family = self.setup_family()
-
-        family['grandma'].name = family['grandpa'].name
-        self.assertNotEqual(family['grandma'].name, family['grandpa'].name)
-
-    def test_rename_c(self):
-        family = self.setup_family()
-
-        family['cousin'].name = family['daughter'].name
-        self.assertNotEqual(family['cousin'].name, family['daughter'].name)
-
-    def test_rename_d(self):
-        family = self.setup_family()
-
-        family['son'].name = family['daughter'].name
-        self.assertNotEqual(family['son'].name, family['daughter'].name)
-
-    def test_add_equal_name_a(self):
-        family = self.setup_family()
-
-        other_daughter = family['mom'].collections.new(family['daughter'].name)
-        self.assertNotEqual(other_daughter.name, family['daughter'].name)
-
-    def test_add_equal_name_b(self):
-        family = self.setup_family()
-
-        other_aunt = family['grandma'].collections.new(family['daughter'].name)
-        self.assertNotEqual(other_aunt.name, family['daughter'].name)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_a.py b/tests/python/render_layer/test_evaluation_render_settings_a.py
deleted file mode 100644
index 3a763dff5b1..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_a.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay()
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-        clay.set('scene', 'matcap_icon', '05')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '05')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_b.py b/tests/python/render_layer/test_evaluation_render_settings_b.py
deleted file mode 100644
index 01536e7edb1..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_b.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay()
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-        clay.set('scene', 'matcap_icon', '05')
-        clay.set('grandma', 'matcap_icon', '03')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '03')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_c.py b/tests/python/render_layer/test_evaluation_render_settings_c.py
deleted file mode 100644
index 62450fac771..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_c.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay()
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-        clay.set('mom', 'matcap_icon', '02')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '02')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_d.py b/tests/python/render_layer/test_evaluation_render_settings_d.py
deleted file mode 100644
index cf29c4928a7..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_d.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay()
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-        clay.set('kid', 'matcap_icon', '05')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '05')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_e.py b/tests/python/render_layer/test_evaluation_render_settings_e.py
deleted file mode 100644
index 664fae7a208..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_e.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay()
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-        clay.set('grandma', 'matcap_icon', '04')
-        clay.set('kid', 'matcap_icon', '05')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '05')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_f.py b/tests/python/render_layer/test_evaluation_render_settings_f.py
deleted file mode 100644
index 47da4e65fcf..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_f.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay(extra_kid_layer=True)
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-
-        clay.set('scene', 'matcap_icon', '05')
-        clay.set('extra', 'matcap_icon', '07')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '07')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_g.py b/tests/python/render_layer/test_evaluation_render_settings_g.py
deleted file mode 100644
index 81f31fed410..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_g.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay(extra_kid_layer=True)
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-
-        clay.set('mom', 'matcap_icon', '02')
-        clay.set('extra', 'matcap_icon', '06')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '06')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_h.py b/tests/python/render_layer/test_evaluation_render_settings_h.py
deleted file mode 100644
index b6f61ddb031..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_h.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay(extra_kid_layer=True)
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-
-        clay.set('kid', 'matcap_icon', '02')
-        clay.set('extra', 'matcap_icon', '04')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '04')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_render_settings_i.py b/tests/python/render_layer/test_evaluation_render_settings_i.py
deleted file mode 100644
index 1ce307deb70..00000000000
--- a/tests/python/render_layer/test_evaluation_render_settings_i.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_render_settings(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        clay = Clay(extra_kid_layer=True)
-        self.assertEqual(clay.get('object', 'matcap_icon'), '01')
-
-        clay.set('mom', 'matcap_icon', '02')
-        self.assertEqual(clay.get('extra', 'matcap_icon'), '01')
-        self.assertEqual(clay.get('object', 'matcap_icon'), '02')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py
deleted file mode 100644
index 393f406eefc..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_a.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Selectability Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = True
-        bpy.context.scene.update()  # update depsgraph
-        cube.select_set('SELECT')
-
-        self.assertTrue(cube.visible_get(), "Cube should be visible")
-        self.assertTrue(cube.select_get(), "Cube should be selected")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
deleted file mode 100644
index ea05710ebcf..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_b.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Selectability Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-        bpy.context.scene.update()  # update depsgraph
-        cube.select_set('SELECT')
-
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertFalse(cube.visible_get(), "Cube should be invisible")
-        self.assertFalse(cube.select_get(), "Cube should be unselected")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/render_layer/test_evaluation_selectability_c.py
deleted file mode 100644
index 8487ee1a8af..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_c.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Selectability Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        bpy.context.scene.update()  # update depsgraph
-        cube.select_set('SELECT')
-
-        self.assertTrue(cube.visible_get(), "Cube should be visible")
-        self.assertTrue(cube.select_get(), "Cube should be selected")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/render_layer/test_evaluation_selectability_d.py
deleted file mode 100644
index b2a924dd6bc..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_d.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Selectability Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        bpy.context.scene.update()  # update depsgraph
-
-        cube.select_set('SELECT')
-        layer_collection_mom.collections[layer_collection_kid.name].hide_select = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Cube should be visible")
-        self.assertTrue(cube.select_get(), "Cube should be selected")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_e.py b/tests/python/render_layer/test_evaluation_selectability_e.py
deleted file mode 100644
index 70ede58cb9e..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_e.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Selectability Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        cube.select_set('SELECT')
-        layer_collection_mom.collections[layer_collection_kid.name].hide_select = True
-        layer_collection_kid.hide = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Cube should be visible")
-        self.assertFalse(cube.select_get(), "Cube should be unselected")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_selectability_f.py b/tests/python/render_layer/test_evaluation_selectability_f.py
deleted file mode 100644
index 7fddfa54b04..00000000000
--- a/tests/python/render_layer/test_evaluation_selectability_f.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_selectability(self):
-        import bpy
-        scene = bpy.context.scene
-
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-        scene_collection = scene.master_collection.collections.new('collection')
-        layer_collection = scene.render_layers.active.collections.link(scene_collection)
-
-        bpy.context.scene.update()  # update depsgraph
-
-        scene_collection.objects.link(cube)
-
-        self.assertFalse(layer_collection.hide)
-        self.assertFalse(layer_collection.hide_select)
-
-        bpy.context.scene.update()  # update depsgraph
-        cube.select_set(action='SELECT')
-        self.assertTrue(cube.select_get())
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/render_layer/test_evaluation_visibility_a.py
deleted file mode 100644
index b9f57539330..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_a.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene.master_collection.collections.new("Kid")
-
-        scene_collection_mom.objects.link(cube)
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = True
-        layer_collection_kid.hide = False
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Object should be visible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_visibility_b.py
deleted file mode 100644
index 712cc9bd277..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertFalse(cube.visible_get(), "Object should be invisible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_c.py b/tests/python/render_layer/test_evaluation_visibility_c.py
deleted file mode 100644
index 5e378fb07e3..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_c.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = False
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Object should be visible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_d.py b/tests/python/render_layer/test_evaluation_visibility_d.py
deleted file mode 100644
index e4f0957bd26..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_d.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Object should be visible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_e.py b/tests/python/render_layer/test_evaluation_visibility_e.py
deleted file mode 100644
index 33c6d7be111..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_e.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_mom.objects.link(cube)
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        layer_collection_kid.hide = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Object should be visible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    # XXX, above statement is not true, why skip the first argument?
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)[1:]
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_f.py b/tests/python/render_layer/test_evaluation_visibility_f.py
deleted file mode 100644
index 66948b343cb..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_f.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        workspace = bpy.context.workspace
-        cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
-
-        layer = scene.render_layers.new('Visibility Test')
-        layer.collections.unlink(layer.collections[0])
-        scene.render_layers.active = layer
-        workspace.render_layer = layer
-
-        scene_collection_mom = scene.master_collection.collections.new("Mom")
-        scene_collection_kid = scene_collection_mom.collections.new("Kid")
-
-        scene_collection_mom.objects.link(cube)
-        scene_collection_kid.objects.link(cube)
-
-        layer_collection_mom = layer.collections.link(scene_collection_mom)
-        layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
-
-        bpy.context.scene.update()  # update depsgraph
-        self.assertTrue(cube.visible_get(), "Object should be visible")
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_g.py b/tests/python/render_layer/test_evaluation_visibility_g.py
deleted file mode 100644
index eb8d3fa8177..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_g.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility_empty(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        self.do_visibility_object_add('EMPTY')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_h.py b/tests/python/render_layer/test_evaluation_visibility_h.py
deleted file mode 100644
index 9b47d0602b6..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_h.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility_cylinder(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        self.do_visibility_object_add('CYLINDER')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_evaluation_visibility_i.py b/tests/python/render_layer/test_evaluation_visibility_i.py
deleted file mode 100644
index 47cde444a66..00000000000
--- a/tests/python/render_layer/test_evaluation_visibility_i.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_visibility_torus(self):
-        """
-        See if the depsgraph evaluation is correct
-        """
-        self.do_visibility_object_add('TORUS')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_layer_linking.py b/tests/python/render_layer/test_layer_linking.py
deleted file mode 100644
index b0cd576d915..00000000000
--- a/tests/python/render_layer/test_layer_linking.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def do_layer_linking(self, filepath_json, link_mode):
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-
-            # open file
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-
-            # create sub-collections
-            three_b = bpy.data.objects.get('T.3b')
-            three_c = bpy.data.objects.get('T.3c')
-
-            scene = bpy.context.scene
-
-            subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-            scorpion = subzero.collections.new('scorpion')
-
-            # test linking sync
-            subzero.objects.link(three_b)
-            scorpion.objects.link(three_c)
-
-            # test unlinking sync
-            layer = scene.render_layers.new('Fresh new Layer')
-
-            if link_mode in {'COLLECTION_LINK', 'COLLECTION_UNLINK'}:
-                layer.collections.link(subzero)
-
-            if link_mode == 'COLLECTION_UNLINK':
-                initial_collection = layer.collections['Master Collection']
-                layer.collections.unlink(initial_collection)
-
-            # save file
-            filepath_nested = os.path.join(dirpath, 'nested.blend')
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_nested)
-
-            # get the generated json
-            datas = query_scene(filepath_nested, 'Main', (get_scene_collections, get_layers))
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_nested_json = os.path.join(dirpath, "nested.json")
-            with open(filepath_nested_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_nested_json,
-                filepath_json,
-                ),
-                "Scene dump files differ")
-
-    def test_syncing_layer_new(self):
-        """
-        See if the creation of new layers is going well
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_new_layer.json')
-        self.do_layer_linking(filepath_json, 'LAYER_NEW')
-
-    def test_syncing_layer_collection_link(self):
-        """
-        See if the creation of new layers is going well
-        And linking a new scene collection in the layer works
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_layer_collection_link.json')
-        self.do_layer_linking(filepath_json, 'COLLECTION_LINK')
-
-    def test_syncing_layer_collection_unlink(self):
-        """
-        See if the creation of new layers is going well
-        And unlinking the origin scene collection works
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_layer_collection_unlink.json')
-        self.do_layer_linking(filepath_json, 'COLLECTION_UNLINK')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_layer_syncing.py b/tests/python/render_layer/test_layer_syncing.py
deleted file mode 100644
index 9ebfe437698..00000000000
--- a/tests/python/render_layer/test_layer_syncing.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def do_syncing(self, filepath_json, unlink_mode):
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-
-            # open file
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-
-            # create sub-collections
-            three_b = bpy.data.objects.get('T.3b')
-            three_c = bpy.data.objects.get('T.3c')
-            three_d = bpy.data.objects.get('T.3d')
-
-            scene = bpy.context.scene
-
-            subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-            scorpion = scene.master_collection.collections['1'].collections.new('scorpion')
-
-            # test linking sync
-            subzero.objects.link(three_b)
-            scorpion.objects.link(three_c)
-
-            # test unlinking sync
-            if unlink_mode in {'OBJECT', 'COLLECTION'}:
-                scorpion.objects.link(three_d)
-                scorpion.objects.unlink(three_d)
-
-            if unlink_mode == 'COLLECTION':
-                scorpion.objects.link(three_d)
-                scene.master_collection.collections['1'].collections.remove(subzero)
-                scene.master_collection.collections['1'].collections.remove(scorpion)
-
-            # save file
-            filepath_nested = os.path.join(dirpath, 'nested.blend')
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_nested)
-
-            # get the generated json
-            datas = query_scene(filepath_nested, 'Main', (get_scene_collections, get_layers))
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_nested_json = os.path.join(dirpath, "nested.json")
-            with open(filepath_nested_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_nested_json,
-                filepath_json,
-                ),
-                "Scene dump files differ")
-
-    def test_syncing_link(self):
-        """
-        See if scene collections and layer collections are in sync
-        when we create new subcollections and link new objects
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_nested.json')
-        self.do_syncing(filepath_json, 'NONE')
-
-    def test_syncing_unlink_object(self):
-        """
-        See if scene collections and layer collections are in sync
-        when we create new subcollections, link new objects and unlink
-        some.
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_nested.json')
-        self.do_syncing(filepath_json, 'OBJECT')
-
-    def test_syncing_unlink_collection(self):
-        """
-        See if scene collections and layer collections are in sync
-        when we create new subcollections, link new objects and unlink full collections
-        some.
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers.json')
-        self.do_syncing(filepath_json, 'COLLECTION')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_a.py b/tests/python/render_layer/test_move_above_below_layer_collection_a.py
deleted file mode 100644
index a36f1f56543..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_a.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 1.3', 'Layer 1.C'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_above('Layer 1.C', 'Layer 1.3'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_b.py b/tests/python/render_layer/test_move_above_below_layer_collection_b.py
deleted file mode 100644
index 373af511e3f..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_b.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 1.3.cat', 'Layer 1.3.dog'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_above('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_c.py b/tests/python/render_layer/test_move_above_below_layer_collection_c.py
deleted file mode 100644
index 373af511e3f..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_c.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 1.3.cat', 'Layer 1.3.dog'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_above('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_d.py b/tests/python/render_layer/test_move_above_below_layer_collection_d.py
deleted file mode 100644
index 8fb1589f741..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_d.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_above('Layer 2.3.dog', 'Layer 1.C.2'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 1.C.2', 'Layer 2.3.dog'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_e.py b/tests/python/render_layer/test_move_above_below_layer_collection_e.py
deleted file mode 100644
index e9b5ab5dbd9..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_e.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 1.Master Collection', 'Layer 1.C.1'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_f.py b/tests/python/render_layer/test_move_above_below_layer_collection_f.py
deleted file mode 100644
index 7b2d00bde2c..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_f.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def get_reference_layers_tree_map(self):
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_below('Layer 2.3', 'Layer 2.C.1'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_above('Layer 2.3', 'Layer 2.C.2'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 2.3')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # collection that will disappear
-        collection_old = self.parse_move('Layer 2.C.3')
-        collection_old.hide = True
-        collection_old.hide_select = False
-
-        # move
-        self.assertTrue(self.move_below('Layer 2.3', 'Layer 2.C.1'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 2.C.3')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_g.py b/tests/python/render_layer/test_move_above_below_layer_collection_g.py
deleted file mode 100644
index c1b85fb357d..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_g.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['cat', None],
-                        ['dog', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_above('Layer 2.C.3.cat', 'Layer 2.3.dog'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 2.C.3.cat')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # collection that will disappear
-        collection_old = self.parse_move('Layer 2.3.cat')
-        collection_old.hide = True
-        collection_old.hide_select = False
-
-        # move
-        self.assertTrue(self.move_above('Layer 2.C.3.cat', 'Layer 2.3.dog'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 2.3.cat')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_h.py b/tests/python/render_layer/test_move_above_below_layer_collection_h.py
deleted file mode 100644
index 090a3c4a49e..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_h.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_below('Layer 2.C.3.cat', 'Layer 2.3.dog'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 2.C.3.cat')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # collection that will disappear
-        collection_old = self.parse_move('Layer 2.3.cat')
-        collection_old.hide = True
-        collection_old.hide_select = False
-
-        # move
-        self.assertTrue(self.move_below('Layer 2.C.3.cat', 'Layer 2.3.dog'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 2.3.cat')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_i.py b/tests/python/render_layer/test_move_above_below_layer_collection_i.py
deleted file mode 100644
index 12aa858ffae..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_i.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    '3',
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_below('Layer 2.C', 'Layer 2.3'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 2.C')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # move
-        self.assertTrue(self.move_below('Layer 2.C', 'Layer 2.3'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 2.C')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_j.py b/tests/python/render_layer/test_move_above_below_layer_collection_j.py
deleted file mode 100644
index af92abac2d3..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_j.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_below('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.assertTrue(self.move_above('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 1.3.dog')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # move
-        self.assertTrue(self.move_below('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.assertTrue(self.move_above('Layer 1.3.dog', 'Layer 1.3.cat'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 1.3.dog')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_k.py b/tests/python/render_layer/test_move_above_below_layer_collection_k.py
deleted file mode 100644
index 74dc68d986f..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_k.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_move(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_below('Layer 2.C.2', 'Layer 2.3'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_l.py b/tests/python/render_layer/test_move_above_below_layer_collection_l.py
deleted file mode 100644
index aebef498f26..00000000000
--- a/tests/python/render_layer/test_move_above_below_layer_collection_l.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'cat',
-                    '3',
-                    'dog',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_below('Layer 2.cat', 'Layer 2.C'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_above('Layer 2.cat', 'Layer 2.3'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_a.py b/tests/python/render_layer/test_move_above_below_scene_collection_a.py
deleted file mode 100644
index b53370befaf..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_a.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_above(tree['dog']))
-        self.assertTrue(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['dog'].move_below(tree['cat']))
-        self.assertTrue(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['dog'].move_below(tree['cat']))
-        self.assertTrue(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_above(tree['dog']))
-        self.assertTrue(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_b.py b/tests/python/render_layer/test_move_above_below_scene_collection_b.py
deleted file mode 100644
index 1eb62d5bfbd..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_b.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_above(tree['1']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['1'].move_below(tree['3']))
-        self.assertTrue(tree['2'].move_below(tree['1']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_above(tree['2']))
-        self.assertTrue(tree['1'].move_above(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_c.py b/tests/python/render_layer/test_move_above_below_scene_collection_c.py
deleted file mode 100644
index c482376a761..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_c.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_below(tree['ii']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_d.py b/tests/python/render_layer/test_move_above_below_scene_collection_d.py
deleted file mode 100644
index 1fce4cd5b62..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_d.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['B', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_e.py b/tests/python/render_layer/test_move_above_below_scene_collection_e.py
deleted file mode 100644
index 797e1fe3fa6..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_e.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['iii', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['iii'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['iii'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_f.py b/tests/python/render_layer/test_move_above_below_scene_collection_f.py
deleted file mode 100644
index 6616e4135e7..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_f.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['A', [
-                            ['i', None],
-                            ['ii', None],
-                            ['iii', None],
-                            ]],
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['A'].move_above(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_g.py b/tests/python/render_layer/test_move_above_below_scene_collection_g.py
deleted file mode 100644
index b4ac53c7bbe..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_g.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_h.py b/tests/python/render_layer/test_move_above_below_scene_collection_h.py
deleted file mode 100644
index a1da80ef2ac..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_h.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_above(collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_below(collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(collection.move_above(master_collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(collection.move_below(master_collection))
-
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_i.py b/tests/python/render_layer/test_move_above_below_scene_collection_i.py
deleted file mode 100644
index 80574558cce..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_i.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_above(tree['2']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_below(tree['2']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_below(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py
deleted file mode 100644
index d562e220c0d..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_above(tree['dog']))
-        self.assertTrue(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['dog'].move_below(tree['cat']))
-        self.assertTrue(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['dog'].move_below(tree['cat']))
-        self.assertTrue(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_above(tree['dog']))
-        self.assertTrue(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py
deleted file mode 100644
index e9bcbd3f956..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_above(tree['1']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['1'].move_below(tree['3']))
-        self.assertTrue(tree['2'].move_below(tree['1']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_above(tree['2']))
-        self.assertTrue(tree['1'].move_above(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py
deleted file mode 100644
index f740e4ddd25..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_below(tree['ii']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py
deleted file mode 100644
index b71bce092f9..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['B', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py
deleted file mode 100644
index 2e708503742..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['iii', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['iii'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['iii'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py
deleted file mode 100644
index 3e84ebc4096..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['A', [
-                            ['i', None],
-                            ['ii', None],
-                            ['iii', None],
-                            ]],
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_move(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['A'].move_above(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py
deleted file mode 100644
index 62ecbf273c4..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['dog'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['cat'].move_below(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py
deleted file mode 100644
index a2a24f8848e..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_above(collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_below(collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(collection.move_above(master_collection))
-
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(collection.move_below(master_collection))
-
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py b/tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py
deleted file mode 100644
index 8d9ef808f42..00000000000
--- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_move_a(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_above(tree['2']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_b(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_below(tree['2']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_c(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_above(tree['cat']))
-        self.compare_tree_maps()
-
-    def test_scene_collection_move_d(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_below(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_a.py b/tests/python/render_layer/test_move_into_layer_collection_a.py
deleted file mode 100644
index 46e53ebb2fb..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_a.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into("Layer 1.C.2", "Layer 2.3"))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_b.py b/tests/python/render_layer/test_move_into_layer_collection_b.py
deleted file mode 100644
index 20c2e9e453f..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_b.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into('Layer 1.3', 'Layer 1.3.cat'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_c.py b/tests/python/render_layer/test_move_into_layer_collection_c.py
deleted file mode 100644
index 4a547a2e08c..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_c.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into("Layer 2.C", "Layer 2.3"))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_d.py b/tests/python/render_layer/test_move_into_layer_collection_d.py
deleted file mode 100644
index 7ca24a3265c..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_d.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into("Layer 2.3.cat", "Layer 2.3"))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_e.py b/tests/python/render_layer/test_move_into_layer_collection_e.py
deleted file mode 100644
index f235d575090..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_e.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into("Layer 1.Master Collection", "Layer 1.C"))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_f.py b/tests/python/render_layer/test_move_into_layer_collection_f.py
deleted file mode 100644
index 5a4267f107d..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_f.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def get_reference_layers_tree_map(self):
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_into_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_into("Layer 1.3", "Layer 1.Master Collection.A"))
-        self.compare_tree_maps()
-
-    def test_layer_collection_into_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 1.3')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        self.assertTrue(self.move_into('Layer 1.3', 'Layer 1.Master Collection.A'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 1.Master Collection.A.3')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_g.py b/tests/python/render_layer/test_move_into_layer_collection_g.py
deleted file mode 100644
index 6845d13aa2f..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_g.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
-        return reference_layers_map
-
-    def test_layer_collection_into_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_into('Layer 2.3', 'Layer 2.C'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_into_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 2.3')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        # collection that will disappear
-        collection_old = self.parse_move('Layer 2.C.3')
-        collection_old.hide = True
-        collection_old.hide_select = False
-
-        # move collection
-        self.assertTrue(self.move_into('Layer 2.3', 'Layer 2.C'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 2.C.3')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_h.py b/tests/python/render_layer/test_move_into_layer_collection_h.py
deleted file mode 100644
index 294a0054083..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_h.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', [
-                        ['dog', None],
-                        ]],
-                    ['2', None],
-                    ['3', [
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into_a(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertTrue(self.move_into('Layer 1.3.dog', 'Layer 1.C.1'))
-        self.compare_tree_maps()
-
-    def test_layer_collection_into_b(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-
-        # collection that will be moved
-        collection_original = self.parse_move('Layer 1.3.dog')
-        collection_original.hide = False
-        collection_original.hide_select = True
-
-        self.assertTrue(self.move_into('Layer 1.3.dog', 'Layer 1.C.1'))
-        self.compare_tree_maps()
-
-        # we expect the settings to be carried along from the
-        # original layer collection
-        collection_new = self.parse_move('Layer 1.C.1.dog')
-        self.assertEqual(collection_new.hide, False)
-        self.assertEqual(collection_new.hide_select, True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_i.py b/tests/python/render_layer/test_move_into_layer_collection_i.py
deleted file mode 100644
index a29ff607c47..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_i.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into('Layer 2.C.3', 'Layer 2.dog'))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_layer_collection_j.py b/tests/python/render_layer/test_move_into_layer_collection_j.py
deleted file mode 100644
index fd98364db5b..00000000000
--- a/tests/python/render_layer/test_move_into_layer_collection_j.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveLayerCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def get_reference_layers_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_layers_tree_map()
-
-    def test_layer_collection_into(self):
-        """
-        Test outliner operations
-        Prevent collection from being dragged into itself
-        """
-        self.setup_tree()
-        self.assertFalse(self.move_into("Layer 2.dog", "Layer 2.3.dog"))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_a.py b/tests/python/render_layer/test_move_into_scene_collection_a.py
deleted file mode 100644
index 00294a9b978..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_a.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_into(tree['2']))
-        self.assertTrue(tree['cat'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_b.py b/tests/python/render_layer/test_move_into_scene_collection_b.py
deleted file mode 100644
index 3c92a0b8bd1..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_b.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_into(tree['B']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_c.py b/tests/python/render_layer/test_move_into_scene_collection_c.py
deleted file mode 100644
index 03ef0df47b0..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_c.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['cat', None],
-                            ]],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_d.py b/tests/python/render_layer/test_move_into_scene_collection_d.py
deleted file mode 100644
index 24678a3b530..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_d.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        # can't move into a collection if already the last item of the collection
-        self.assertFalse(tree['cat'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_e.py b/tests/python/render_layer/test_move_into_scene_collection_e.py
deleted file mode 100644
index 6f8115e42b3..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_e.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', [
-                            ['B', None],
-                            ]],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_into(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_f.py b/tests/python/render_layer/test_move_into_scene_collection_f.py
deleted file mode 100644
index dcc62e6b7bb..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_f.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ['B', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_g.py b/tests/python/render_layer/test_move_into_scene_collection_g.py
deleted file mode 100644
index 5a96f901523..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_g.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['A', [
-                                ['i', None],
-                                ['ii', None],
-                                ['iii', None],
-                                ]],
-                            ]],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['A'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_h.py b/tests/python/render_layer/test_move_into_scene_collection_h.py
deleted file mode 100644
index 24dce2c7cc9..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_h.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', [
-                        ['ii', None],
-                        ]],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['ii'].move_into(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_i.py b/tests/python/render_layer/test_move_into_scene_collection_i.py
deleted file mode 100644
index 445fb78a345..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_i.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['ii', None],
-                            ]],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['ii'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_j.py b/tests/python/render_layer/test_move_into_scene_collection_j.py
deleted file mode 100644
index bbf682a7082..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_j.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_into(collection))
-
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_k.py b/tests/python/render_layer/test_move_into_scene_collection_k.py
deleted file mode 100644
index afc260d51ae..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_k.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_into(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_l.py b/tests/python/render_layer/test_move_into_scene_collection_l.py
deleted file mode 100644
index b600db03a0c..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_l.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_into(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_a.py b/tests/python/render_layer/test_move_into_scene_collection_sync_a.py
deleted file mode 100644
index e49baaeb84a..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_a.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_into(tree['2']))
-        self.assertTrue(tree['cat'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_b.py b/tests/python/render_layer/test_move_into_scene_collection_sync_b.py
deleted file mode 100644
index 78d24dfea98..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_b.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['3'].move_into(tree['B']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_c.py b/tests/python/render_layer/test_move_into_scene_collection_sync_c.py
deleted file mode 100644
index 3b9a2cfdbb6..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_c.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['cat', None],
-                            ]],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['cat'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_d.py b/tests/python/render_layer/test_move_into_scene_collection_sync_d.py
deleted file mode 100644
index cf9d1b851e5..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_d.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        # can't move into a collection if already the last item of the collection
-        self.assertFalse(tree['cat'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_e.py b/tests/python/render_layer/test_move_into_scene_collection_sync_e.py
deleted file mode 100644
index 087920f0c89..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_e.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', [
-                            ['B', None],
-                            ]],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_into(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_f.py b/tests/python/render_layer/test_move_into_scene_collection_sync_f.py
deleted file mode 100644
index 554fb941c28..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_f.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ['B', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['B'].move_into(tree['3']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_g.py b/tests/python/render_layer/test_move_into_scene_collection_sync_g.py
deleted file mode 100644
index 09a544b0d27..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_g.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['A', [
-                                ['i', None],
-                                ['ii', None],
-                                ['iii', None],
-                                ]],
-                            ]],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['A'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_h.py b/tests/python/render_layer/test_move_into_scene_collection_sync_h.py
deleted file mode 100644
index a2338e70f08..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_h.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', [
-                        ['ii', None],
-                        ]],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['ii'].move_into(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_i.py b/tests/python/render_layer/test_move_into_scene_collection_sync_i.py
deleted file mode 100644
index 59e0a06cd73..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_i.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
-                            ['ii', None],
-                            ]],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
-        return reference_tree_map
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertTrue(tree['ii'].move_into(tree['dog']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_j.py b/tests/python/render_layer/test_move_into_scene_collection_sync_j.py
deleted file mode 100644
index b1e2d3446a6..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_j.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-
-        tree = self.setup_tree()
-
-        for collection in tree.values():
-            # can't move into master_collection anywhere
-            self.assertFalse(master_collection.move_into(collection))
-
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_k.py b/tests/python/render_layer/test_move_into_scene_collection_sync_k.py
deleted file mode 100644
index f5fbe9898e3..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_k.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_into(tree['2']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_l.py b/tests/python/render_layer/test_move_into_scene_collection_sync_l.py
deleted file mode 100644
index d8133938fd7..00000000000
--- a/tests/python/render_layer/test_move_into_scene_collection_sync_l.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(MoveSceneCollectionSyncTesting):
-    def get_reference_scene_tree_map(self):
-        # original tree, no changes
-        return self.get_initial_scene_tree_map()
-
-    def test_scene_collection_into(self):
-        """
-        Test outliner operations
-        """
-        tree = self.setup_tree()
-        self.assertFalse(tree['C'].move_into(tree['cat']))
-        self.compare_tree_maps()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_cylinder.py b/tests/python/render_layer/test_object_add_cylinder.py
deleted file mode 100644
index d561f1c04fc..00000000000
--- a/tests/python/render_layer/test_object_add_cylinder.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_syncing_object_add_cylinder(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.mesh.primitive_cylinder_add()
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_object_add_cylinder.json')
-        self.do_object_add(filepath_json, 'CYLINDER')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_empty.py b/tests/python/render_layer/test_object_add_empty.py
deleted file mode 100644
index e4f3c94f8a5..00000000000
--- a/tests/python/render_layer/test_object_add_empty.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_syncing_object_add_empty(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.object.add()
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_object_add_empty.json')
-        self.do_object_add(filepath_json, 'EMPTY')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_no_collection_cylinder.py b/tests/python/render_layer/test_object_add_no_collection_cylinder.py
deleted file mode 100644
index f0770cb15e5..00000000000
--- a/tests/python/render_layer/test_object_add_no_collection_cylinder.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_add_cylinder(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.mesh.primitive_cylinder_add()
-        """
-        import os
-        self.do_object_add_no_collection('CYLINDER')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_no_collection_empty.py b/tests/python/render_layer/test_object_add_no_collection_empty.py
deleted file mode 100644
index cc5bfbe8562..00000000000
--- a/tests/python/render_layer/test_object_add_no_collection_empty.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_syncing_object_add_empty(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.object.add()
-        """
-        self.do_object_add_no_collection('EMPTY')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_no_collection_torus.py b/tests/python/render_layer/test_object_add_no_collection_torus.py
deleted file mode 100644
index c87acfbc996..00000000000
--- a/tests/python/render_layer/test_object_add_no_collection_torus.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_syncing_object_add_torus(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.mesh.primitive_torus_add()
-        """
-        self.do_object_add_no_collection('TORUS')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_add_torus.py b/tests/python/render_layer/test_object_add_torus.py
deleted file mode 100644
index a92c42bc926..00000000000
--- a/tests/python/render_layer/test_object_add_torus.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_syncing_object_add_torus(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.mesh.primitive_torus_add()
-        """
-        import os
-        ROOT = self.get_root()
-        filepath_json = os.path.join(ROOT, 'layers_object_add_torus.json')
-        self.do_object_add(filepath_json, 'TORUS')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_copy.py b/tests/python/render_layer/test_object_copy.py
deleted file mode 100644
index 1e6e9e5b889..00000000000
--- a/tests/python/render_layer/test_object_copy.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def do_object_copy(self, mode):
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        ROOT = self.get_root()
-        with tempfile.TemporaryDirectory() as dirpath:
-            filepath_layers = os.path.join(ROOT, 'layers.blend')
-            filepath_json = os.path.join(ROOT, 'layers_object_copy_duplicate.json')
-
-            # open file
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-
-            # create sub-collections
-            three_b = bpy.data.objects.get('T.3b')
-            three_c = bpy.data.objects.get('T.3c')
-
-            scene = bpy.context.scene
-            subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-            scorpion = subzero.collections.new('scorpion')
-            subzero.objects.link(three_b)
-            scorpion.objects.link(three_c)
-            layer = scene.render_layers.new('Fresh new Layer')
-            layer.collections.link(subzero)
-
-            scene.render_layers.active_index = len(scene.render_layers) - 1
-            bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Fresh new Layer']
-
-            if mode == 'DUPLICATE':
-                # assuming the latest layer is the active layer
-                bpy.ops.object.select_all(action='DESELECT')
-                three_c.select_set(action='SELECT')
-                bpy.ops.object.duplicate()
-
-            elif mode == 'NAMED':
-                bpy.ops.object.add_named(name=three_c.name)
-
-            # save file
-            filepath_objects = os.path.join(dirpath, 'objects.blend')
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_objects)
-
-            # get the generated json
-            datas = query_scene(filepath_objects, 'Main', (get_scene_collections, get_layers))
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_objects_json = os.path.join(dirpath, "objects.json")
-            with open(filepath_objects_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_objects_json,
-                filepath_json,
-                ),
-                "Scene dump files differ")
-
-    def test_copy_object(self):
-        """
-        OBJECT_OT_duplicate
-        """
-        self.do_object_copy('DUPLICATE')
-
-    def test_copy_object_named(self):
-        """
-        OBJECT_OT_add_named
-        """
-        self.do_object_copy('NAMED')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_delete_a.py b/tests/python/render_layer/test_object_delete_a.py
deleted file mode 100644
index 60c3841a0ad..00000000000
--- a/tests/python/render_layer/test_object_delete_a.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_delete_data(self):
-        """
-        See if objects are removed correctly from all related collections
-        bpy.data.objects.remove()
-        """
-        self.do_object_delete('DATA')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_delete_b.py b/tests/python/render_layer/test_object_delete_b.py
deleted file mode 100644
index 7bb8279f2f7..00000000000
--- a/tests/python/render_layer/test_object_delete_b.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_delete_operator(self):
-        """
-        See if new objects are added to the correct collection
-        bpy.ops.object.del()
-        """
-        self.do_object_delete('OPERATOR')
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_link_a.py b/tests/python/render_layer/test_object_link_a.py
deleted file mode 100644
index 2106d4cd626..00000000000
--- a/tests/python/render_layer/test_object_link_a.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_link_scene(self):
-        """
-        See if we can link objects
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-        self.do_object_link(master_collection)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_link_b.py b/tests/python/render_layer/test_object_link_b.py
deleted file mode 100644
index b18eb844fc4..00000000000
--- a/tests/python/render_layer/test_object_link_b.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_link_context(self):
-        """
-        See if we can link objects via bpy.context.scene_collection
-        """
-        import bpy
-        bpy.context.scene.render_layers.active_index = len(bpy.context.scene.render_layers) - 1
-        bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
-        master_collection = bpy.context.scene_collection
-        self.do_object_link(master_collection)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_object_link_c.py b/tests/python/render_layer/test_object_link_c.py
deleted file mode 100644
index ad69631dddc..00000000000
--- a/tests/python/render_layer/test_object_link_c.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_object_link_reload(self):
-        """
-        See if we can link objects and not crash
-        """
-        import bpy
-        master_collection = bpy.context.scene.master_collection
-        self.do_object_link(master_collection)
-
-        # force depsgraph to update
-        bpy.ops.wm.read_factory_settings()
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_operator_context.py b/tests/python/render_layer/test_operator_context.py
deleted file mode 100644
index 5055d957551..00000000000
--- a/tests/python/render_layer/test_operator_context.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_operator_context(self):
-        """
-        See if render layer context is properly set/get with operators overrides
-        when we set render_layer in context, the collection should change as well
-        """
-        import bpy
-        import os
-
-        class SampleOperator(bpy.types.Operator):
-            bl_idname = "testing.sample"
-            bl_label = "Sample Operator"
-
-            render_layer = bpy.props.StringProperty(
-                    default="Not Set",
-                    options={'SKIP_SAVE'},
-                    )
-
-            scene_collection = bpy.props.StringProperty(
-                    default="",
-                    options={'SKIP_SAVE'},
-                    )
-
-            use_verbose = bpy.props.BoolProperty(
-                    default=False,
-                    options={'SKIP_SAVE'},
-                    )
-
-            def execute(self, context):
-                render_layer = context.render_layer
-                ret = {'FINISHED'}
-
-                # this is simply playing safe
-                if render_layer.name != self.render_layer:
-                    if self.use_verbose:
-                        print('ERROR: Render Layer mismatch: "{0}" != "{1}"'.format(
-                            render_layer.name, self.render_layer))
-                    ret = {'CANCELLED'}
-
-                scene_collection_name = None
-                if self.scene_collection:
-                    scene_collection_name = self.scene_collection
-                else:
-                    scene_collection_name = render_layer.collections.active.name
-
-                # while this is the real test
-                if context.scene_collection.name != scene_collection_name:
-                    if self.use_verbose:
-                        print('ERROR: Scene Collection mismatch: "{0}" != "{1}"'.format(
-                            context.scene_collection.name, scene_collection_name))
-                    ret = {'CANCELLED'}
-                return ret
-
-        bpy.utils.register_class(SampleOperator)
-
-        # open sample file
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-        bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-        self.rename_collections()
-
-        # change the file
-        three_b = bpy.data.objects.get('T.3b')
-        three_c = bpy.data.objects.get('T.3c')
-        scene = bpy.context.scene
-        subzero = scene.master_collection.collections['1'].collections.new('sub-zero')
-        scorpion = subzero.collections.new('scorpion')
-        subzero.objects.link(three_b)
-        scorpion.objects.link(three_c)
-        layer = scene.render_layers.new('Fresh new Layer')
-        layer.collections.unlink(layer.collections.active)
-        layer.collections.link(subzero)
-        layer.collections.active_index = 3
-        self.assertEqual(layer.collections.active.name, 'scorpion')
-
-        # Change active scene layer (do it for workspace too just to don't get mangled in workspace bugs)
-        scene = bpy.context.scene
-        scene.render_layers.active_index = len(scene.render_layers) - 2
-        self.assertEqual(scene.render_layers.active.name, "Viewport")
-        bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
-
-        # old layer
-        self.assertEqual(bpy.ops.testing.sample(render_layer='Viewport', use_verbose=True), {'FINISHED'})
-
-        # expected to fail
-        self.assertTrue(bpy.ops.testing.sample(render_layer=layer.name), {'CANCELLED'})
-
-        # set render layer and scene collection
-        override = bpy.context.copy()
-        override["render_layer"] = layer
-        override["scene_collection"] = subzero
-        self.assertEqual(bpy.ops.testing.sample(
-            override,
-            render_layer=layer.name,
-            scene_collection=subzero.name,  # 'sub-zero'
-            use_verbose=True), {'FINISHED'})
-
-        # set only render layer
-        override = bpy.context.copy()
-        override["render_layer"] = layer
-
-        self.assertEqual(bpy.ops.testing.sample(
-            override,
-            render_layer=layer.name,
-            scene_collection=layer.collections.active.name,  # 'scorpion'
-            use_verbose=True), {'FINISHED'})
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_a.py b/tests/python/render_layer/test_scene_copy_a.py
deleted file mode 100644
index 9fcf264feb5..00000000000
--- a/tests/python/render_layer/test_scene_copy_a.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_scene_collections_copy_full(self):
-        """
-        See if scene copying 'FULL_COPY' is working for scene collections
-        """
-        import os
-        ROOT = self.get_root()
-
-        filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full_simple.json')
-        self.do_scene_copy(
-                filepath_layers_json_copy,
-                'FULL_COPY',
-                (get_scene_collections,))
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_b.py b/tests/python/render_layer/test_scene_copy_b.py
deleted file mode 100644
index 1184655223b..00000000000
--- a/tests/python/render_layer/test_scene_copy_b.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_scene_collections_link(self):
-        """
-        See if scene copying 'LINK_OBJECTS' is working for scene collections
-        """
-        import os
-        ROOT = self.get_root()
-
-        # note: nothing should change, so using `layers_simple.json`
-        filepath_layers_json_copy = os.path.join(ROOT, 'layers_simple.json')
-        self.do_scene_copy(
-                filepath_layers_json_copy,
-                'LINK_OBJECTS',
-                (get_scene_collections,))
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_c.py b/tests/python/render_layer/test_scene_copy_c.py
deleted file mode 100644
index b446464b1c2..00000000000
--- a/tests/python/render_layer/test_scene_copy_c.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_scene_layers_copy(self):
-        """
-        See if scene copying 'FULL_COPY' is working for scene layers
-        """
-        import os
-        ROOT = self.get_root()
-
-        filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full.json')
-        self.do_scene_copy(
-                filepath_layers_json_copy,
-                'FULL_COPY',
-                (get_scene_collections, get_layers))
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_d.py b/tests/python/render_layer/test_scene_copy_d.py
deleted file mode 100644
index f398650eade..00000000000
--- a/tests/python/render_layer/test_scene_copy_d.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_scene_layers_link(self):
-        """
-        See if scene copying 'LINK_OBJECTS' is working for scene layers
-        """
-        import os
-        ROOT = self.get_root()
-
-        filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_link.json')
-        self.do_scene_copy(
-                filepath_layers_json_copy,
-                'LINK_OBJECTS',
-                (get_scene_collections, get_layers))
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_e.py b/tests/python/render_layer/test_scene_copy_e.py
deleted file mode 100644
index 8e1afb1b2ea..00000000000
--- a/tests/python/render_layer/test_scene_copy_e.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_shared_layer_collections_copy_full(self):
-        """
-        See if scene copying 'FULL_COPY' is working for scene collections
-        with a shared object
-        """
-        import os
-        import bpy
-
-        scene = bpy.context.scene
-        layer = bpy.context.render_layer
-
-        original_cube = layer.objects.get('Cube')
-        original_cube.select_set('SELECT')
-        self.assertTrue(original_cube.select_get())
-
-        bpy.ops.scene.new(type='FULL_COPY')
-        new_layer = bpy.context.render_layer
-
-        self.assertNotEqual(layer, new_layer)
-        new_cube = new_layer.objects.get('Cube.001')
-        self.assertNotEqual(original_cube, new_cube)
-        self.assertTrue(new_cube.select_get())
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_copy_f.py b/tests/python/render_layer/test_scene_copy_f.py
deleted file mode 100644
index fd4298675f2..00000000000
--- a/tests/python/render_layer/test_scene_copy_f.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_shared_layer_collections_copy_full(self):
-        """
-        See if scene copying 'FULL_COPY' is keeping collections visibility
-        and selectability.
-        """
-        import os
-        import bpy
-
-        scene = bpy.context.scene
-
-        hide_lookup = [0, 1, 1, 0]
-        hide_lookup_sub = [1, 0, 1]
-
-        hide_select_lookup = [0, 0, 1, 1]
-        hide_select_lookup_sub = [1, 0, 1, 0]
-        new_collections = []
-
-        # clean everything
-        for layer in scene.render_layers:
-            while layer.collections:
-                layer.collections.unlink(layer.collections[0])
-
-        # create new collections
-        for i in range(4):
-            collection = scene.master_collection.collections.new(str(i))
-            new_collections.append(collection)
-
-            for j in range(3):
-                sub_collection = collection.collections.new("{0}:{1}".format(i, j))
-
-        # link to the original scene
-        for layer in scene.render_layers:
-            for i, collection in enumerate(new_collections):
-                layer.collections.link(collection)
-                self.assertEqual(layer.collections[-1], layer.collections[i])
-
-                layer.collections[i].hide = hide_lookup[i]
-                layer.collections[i].hide_select = hide_select_lookup[i]
-
-                for j, sub_collection in enumerate(layer.collections[i].collections):
-                    sub_collection.hide = hide_lookup_sub[j]
-                    sub_collection.hide_select = hide_select_lookup_sub[j]
-
-        # copy scene
-        bpy.ops.scene.new(type='FULL_COPY')
-        new_scene = bpy.context.scene
-        self.assertNotEqual(scene, new_scene)
-
-        # update depsgrah
-        scene.update()  # update depsgraph
-
-        # compare scenes
-        for h, layer in enumerate(scene.render_layers):
-            new_layer = new_scene.render_layers[h]
-
-            for i, collection in enumerate(layer.collections):
-                new_collection = new_layer.collections[i]
-                self.assertEqual(collection.hide, new_collection.hide)
-                self.assertEqual(collection.hide_select, new_collection.hide_select)
-
-                for j, sub_collection in enumerate(layer.collections[i].collections):
-                    new_sub_collection = new_collection.collections[j]
-                    self.assertEqual(sub_collection.hide, new_sub_collection.hide)
-                    self.assertEqual(sub_collection.hide_select, new_sub_collection.hide_select)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_delete.py b/tests/python/render_layer/test_scene_delete.py
deleted file mode 100644
index cd59a446c9a..00000000000
--- a/tests/python/render_layer/test_scene_delete.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def test_scene_delete(self):
-        """
-        See if a scene can be properly deleted
-        """
-        import bpy
-
-        scene = bpy.context.scene
-        bpy.data.scenes.new('New')
-        bpy.data.scenes.remove(scene)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
-    unittest.main()
diff --git a/tests/python/render_layer/test_scene_write_read.py b/tests/python/render_layer/test_scene_write_read.py
deleted file mode 100644
index 3338aff291a..00000000000
--- a/tests/python/render_layer/test_scene_write_read.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# ############################################################
-# Importing - Same For All Render Layer Tests
-# ############################################################
-
-import unittest
-import os
-import sys
-
-from render_layer_common import *
-
-
-# ############################################################
-# Testing
-# ############################################################
-
-class UnitTesting(RenderLayerTesting):
-    def do_scene_write_read(self, filepath_layers, filepath_layers_json, data_callbacks, do_read):
-        """
-        See if write/read is working for scene collections and layers
-        """
-        import bpy
-        import os
-        import tempfile
-        import filecmp
-
-        with tempfile.TemporaryDirectory() as dirpath:
-            (self.path_exists(f) for f in (filepath_layers, filepath_layers_json))
-
-            filepath_doversion = os.path.join(dirpath, 'doversion.blend')
-            filepath_saved = os.path.join(dirpath, 'doversion_saved.blend')
-            filepath_read_json = os.path.join(dirpath, "read.json")
-
-            # doversion + write test
-            bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_layers)
-            self.rename_collections()
-            bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_doversion)
-
-            datas = query_scene(filepath_doversion, 'Main', data_callbacks)
-            self.assertTrue(datas, "Data is not valid")
-
-            filepath_doversion_json = os.path.join(dirpath, "doversion.json")
-            with open(filepath_doversion_json, "w") as f:
-                for data in datas:
-                    f.write(dump(data))
-
-            self.assertTrue(compare_files(
-                filepath_doversion_json,
-                filepath_layers_json,
-                ),
-                "Run: test_scene_write_layers")
-
-            if do_read:
-                # read test, simply open and save the file
-                bpy.ops.wm.open_mainfile('EXEC_DEFAULT', filepath=filepath_doversion)
-                self.rename_collections()
-                bpy.ops.wm.save_mainfile('EXEC_DEFAULT', filepath=filepath_saved)
-
-                datas = query_scene(filepath_saved, 'Main', data_callbacks)
-                self.assertTrue(datas, "Data is not valid")
-
-                with open(filepath_read_json, "w") as f:
-                    for data in datas:
-                        f.write(dump(data))
-
-                self.assertTrue(compare_files(
-                    filepath_read_json,
-                    filepath_layers_json,
-                    ),
-                    "Scene dump files differ")
-
-    def test_scene_write_collections(self):
-        """
-        See if the doversion and writing are working for scene collections
-        """
-        import os
-
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-        filepath_layers_json = os.path.join(ROOT, 'layers_simple.json')
-
-        self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections,),
-                False)
-
-    def test_scene_write_layers(self):
-        """
-        See if the doversion and writing are working for collections and layers
-        """
-        import os
-
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-        filepath_layers_json = os.path.join(ROOT, 'layers.json')
-
-        self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections, get_layers),
-                False)
-
-    def test_scene_read_collections(self):
-        """
-        See if read is working for scene collections
-        (run `test_scene_write_colections` first)
-        """
-        import os
-
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-        filepath_layers_json = os.path.join(ROOT, 'layers_simple.json')
-
-        self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections,),
-                True)
-
-    def test_scene_read_layers(self):
-        """
-        See if read is working for scene layers
-        (run `test_scene_write_layers` first)
-        """
-        import os
-
-        ROOT = self.get_root()
-        filepath_layers = os.path.join(ROOT, 'layers.blend')
-        filepath_layers_json = os.path.join(ROOT, 'layers.json')
-
-        self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections, get_layers),
-                True)
-
-
-# ############################################################
-# Main - Same For All Render Layer Tests
-# ############################################################
-
-if __name__ == '__main__':
-    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
-    unittest.main()