diff --git a/tests/functional/tests/basic/test_pyocf.py b/tests/functional/tests/basic/test_pyocf.py
index 16a5f0c..865bac6 100644
--- a/tests/functional/tests/basic/test_pyocf.py
+++ b/tests/functional/tests/basic/test_pyocf.py
@@ -19,31 +19,6 @@ def test_ctx_fixture(pyocf_ctx):
     pass
 
 
-def test_adding_cores(pyocf_ctx):
-    cache_device = Volume(S.from_MiB(200))
-    core1_device = Volume(S.from_MiB(400))
-    core2_device = Volume(S.from_MiB(400))
-
-    cache = Cache.start_on_device(cache_device)
-    core1 = Core.using_device(core1_device)
-    core2 = Core.using_device(core2_device)
-
-    cache.add_core(core1)
-    cache.add_core(core2)
-
-
-def test_adding_core_twice(pyocf_ctx):
-    cache_device = Volume(S.from_MiB(200))
-    core_device = Volume(S.from_MiB(400))
-
-    cache = Cache.start_on_device(cache_device)
-    core = Core.using_device(core_device)
-
-    cache.add_core(core)
-    with pytest.raises(OcfError):
-        cache.add_core(core)
-
-
 def test_simple_wt_write(pyocf_ctx):
     cache_device = Volume(S.from_MiB(100))
     core_device = Volume(S.from_MiB(200))
diff --git a/tests/functional/tests/management/__init__.py b/tests/functional/tests/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/functional/tests/management/test_add_remove.py b/tests/functional/tests/management/test_add_remove.py
new file mode 100644
index 0000000..0c041a6
--- /dev/null
+++ b/tests/functional/tests/management/test_add_remove.py
@@ -0,0 +1,265 @@
+# Copyright(c) 2019 Intel Corporation
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+
+import pytest
+from ctypes import c_int
+
+from random import randint
+from pyocf.types.cache import Cache, CacheMode
+from pyocf.types.core import Core
+from pyocf.types.volume import Volume
+from pyocf.types.data import Data
+from pyocf.types.io import IoDir
+from pyocf.utils import Size as S
+from pyocf.types.shared import OcfError, OcfCompletion, CacheLineSize
+
+
+@pytest.mark.parametrize("cache_mode", CacheMode)
+@pytest.mark.parametrize("cls", CacheLineSize)
+def test_adding_core(pyocf_ctx, cache_mode, cls):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device, cache_mode=cache_mode, cache_line_size=cls)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Check statistics before adding core
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == 0
+
+    # Add core to cache
+    cache.add_core(core)
+
+    # Check statistics after adding core
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == 1
+
+
+@pytest.mark.parametrize("cache_mode", CacheMode)
+@pytest.mark.parametrize("cls", CacheLineSize)
+def test_removing_core(pyocf_ctx, cache_mode, cls):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device, cache_mode=cache_mode, cache_line_size=cls)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Add core to cache
+    cache.add_core(core)
+
+    # Remove core from cache
+    cache.remove_core(core)
+
+    # Check statistics after removing core
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == 0
+
+
+def test_100add_remove(pyocf_ctx):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Add and remove core device in a loop 100 times
+    # Check statistics after every operation
+    for i in range(0, 100):
+        cache.add_core(core)
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == 1
+
+        cache.remove_core(core)
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == 0
+
+
+def test_10add_remove_with_io(pyocf_ctx):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Add and remove core 10 times in a loop with io in between
+    for i in range(0, 10):
+        cache.add_core(core)
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == 1
+
+        write_data = Data.from_string("Test data")
+        io = core.new_io()
+        io.set_data(write_data)
+        io.configure(20, write_data.size, IoDir.WRITE, 0, 0)
+        io.set_queue(cache.get_default_queue())
+
+        cmpl = OcfCompletion([("err", c_int)])
+        io.callback = cmpl.callback
+        io.submit()
+        cmpl.wait()
+
+        cache.remove_core(core)
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == 0
+
+
+def test_add_remove_50core(pyocf_ctx):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device)
+    core_devices = []
+    core_amount = 50
+
+    # Add 50 cores and check stats after each addition
+    for i in range(0, core_amount):
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == i
+        core_device = Volume(S.from_MiB(10))
+        core = Core.using_device(core_device)
+        core_devices.append(core)
+        cache.add_core(core)
+
+    # Remove 50 cores and check stats before each removal
+    for i in range(0, core_amount):
+        stats = cache.get_stats()
+        assert stats["conf"]["core_count"] == core_amount - i
+        cache.remove_core(core_devices[i])
+
+    # Check statistics
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == 0
+
+
+def test_adding_to_random_cache(pyocf_ctx):
+    cache_devices = []
+    core_devices = {}
+    cache_amount = 5
+    core_amount = 50
+
+    # Create 5 cache devices
+    for i in range(0, cache_amount):
+        cache_device = Volume(S.from_MiB(100))
+        cache = Cache.start_on_device(cache_device)
+        cache_devices.append(cache)
+
+    # Create 50 core devices and add to random cache
+    for i in range(0, core_amount):
+        core_device = Volume(S.from_MiB(10))
+        core = Core.using_device(core_device)
+        core_devices[core] = randint(0, cache_amount - 1)
+        cache_devices[core_devices[core]].add_core(core)
+
+    # Count expected number of cores per cache
+    count_dict = {}
+    for i in range(0, cache_amount):
+        count_dict[i] = sum(k == i for k in core_devices.values())
+
+    # Check if cache statistics are as expected
+    for i in range(0, cache_amount):
+        stats = cache_devices[i].get_stats()
+        assert stats["conf"]["core_count"] == count_dict[i]
+
+
+@pytest.mark.parametrize("cache_mode", CacheMode)
+@pytest.mark.parametrize("cls", CacheLineSize)
+def test_adding_core_twice(pyocf_ctx, cache_mode, cls):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device, cache_mode=cache_mode, cache_line_size=cls)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Add core
+    cache.add_core(core)
+
+    # Check that it is not possible to add the same core again
+    with pytest.raises(OcfError):
+        cache.add_core(core)
+
+    # Check that core count is still equal to one
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == 1
+
+
+@pytest.mark.parametrize("cache_mode", CacheMode)
+@pytest.mark.parametrize("cls", CacheLineSize)
+def test_adding_core_already_used(pyocf_ctx, cache_mode, cls):
+    # Start first cache device
+    cache_device1 = Volume(S.from_MiB(100))
+    cache1 = Cache.start_on_device(cache_device1, cache_mode=cache_mode, cache_line_size=cls)
+
+    # Start second cache device
+    cache_device2 = Volume(S.from_MiB(100))
+    cache2 = Cache.start_on_device(cache_device2, cache_mode=cache_mode, cache_line_size=cls)
+
+    # Create core device
+    core_device = Volume(S.from_MiB(10))
+    core = Core.using_device(core_device)
+
+    # Add core to first cache
+    cache1.add_core(core)
+
+    # Check that it is not possible to add core to second cache
+    with pytest.raises(OcfError):
+        cache2.add_core(core)
+
+    # Check that core count is as expected
+    stats = cache1.get_stats()
+    assert stats["conf"]["core_count"] == 1
+
+    stats = cache2.get_stats()
+    assert stats["conf"]["core_count"] == 0
+
+
+@pytest.mark.parametrize("cache_mode", CacheMode)
+@pytest.mark.parametrize("cls", CacheLineSize)
+def test_add_remove_incrementally(pyocf_ctx, cache_mode, cls):
+    # Start cache device
+    cache_device = Volume(S.from_MiB(100))
+    cache = Cache.start_on_device(cache_device, cache_mode=cache_mode, cache_line_size=cls)
+    core_devices = []
+    core_amount = 5
+
+    # Create 5 core devices and add to cache
+    for i in range(0, core_amount):
+        core_device = Volume(S.from_MiB(10))
+        core = Core.using_device(core_device)
+        core_devices.append(core)
+        cache.add_core(core)
+
+    # Check that core count is as expected
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == core_amount
+
+    # Remove 3 cores
+    cache.remove_core(core_devices[0])
+    cache.remove_core(core_devices[1])
+    cache.remove_core(core_devices[2])
+
+    # Add 2 cores and check if core count is as expected
+    cache.add_core(core_devices[0])
+    cache.add_core(core_devices[1])
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == core_amount - 1
+
+    # Remove 1 core and check if core count is as expected
+    cache.remove_core(core_devices[1])
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == core_amount - 2
+
+    # Add 2 cores and check if core count is as expected
+    cache.add_core(core_devices[1])
+    cache.add_core(core_devices[2])
+    stats = cache.get_stats()
+    assert stats["conf"]["core_count"] == core_amount