diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 8fb608a..c194021 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -56,5 +56,3 @@
 endif(VALGRIND)
 
 add_subdirectory(stubs)
-add_subdirectory(fakes)
-
diff --git a/UNITTESTS/fakes/CMakeLists.txt b/UNITTESTS/fakes/CMakeLists.txt
deleted file mode 100644
index 8c1c4a9..0000000
--- a/UNITTESTS/fakes/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(ble)
diff --git a/UNITTESTS/fakes/ble/BLE.cpp b/UNITTESTS/fakes/ble/BLE.cpp
deleted file mode 100644
index 9dbedb1..0000000
--- a/UNITTESTS/fakes/ble/BLE.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ble/BLE.h"
-#include "GattServerImpl_mock.h"
-#include "GattClientImpl_mock.h"
-#include "GapImpl_mock.h"
-#include "SecurityManagerImpl_mock.h"
-#include "ble/GattClient.h"
-#include "ble/GattServer.h"
-#include "ble/SecurityManager.h"
-#include "ble/Gap.h"
-#include "ble_mocks.h"
-
-namespace ble {
-
-static GapMock *gap_impl = nullptr;
-static GattServerMock *gatt_server_impl = nullptr;
-static GattClientMock *gatt_client_impl = nullptr;
-static SecurityManagerMock *security_manager_impl = nullptr;
-
-static Gap *gap = nullptr;
-static GattServer *gatt_server = nullptr;
-static GattClient *gatt_client = nullptr;
-static SecurityManager *security_manager = nullptr;
-
-GapMock& gap_mock() {
-    return *ble::gap_impl;
-}
-
-GattServerMock& gatt_server_mock() {
-    return *ble::gatt_server_impl;
-}
-
-GattClientMock& gatt_client_mock() {
-    return *ble::gatt_client_impl;
-}
-
-SecurityManagerMock& security_manager_mock() {
-    return *ble::security_manager_impl;
-}
-
-void init_mocks() {
-    if (gap_impl) {
-        /* we are already initialised */
-        return;
-    }
-
-    /* mocks */
-    gap_impl = new GapMock();
-    gatt_server_impl = new GattServerMock();
-    gatt_client_impl = new GattClientMock();
-    security_manager_impl = new SecurityManagerMock();
-    /* user APIS */
-    gap = new Gap(gap_impl);
-    gatt_server = new GattServer(gatt_server_impl);
-    gatt_client = new GattClient(gatt_client_impl);
-    security_manager = new SecurityManager(security_manager_impl);
-}
-
-void delete_mocks() {
-    delete gap;
-    delete gap_impl;
-    delete gatt_server;
-    delete gatt_server_impl;
-    delete gatt_client;
-    delete gatt_client_impl;
-    delete security_manager;
-    delete security_manager_impl;
-
-    gap = nullptr;
-    gap_impl = nullptr;
-    gatt_server = nullptr;
-    gatt_server_impl = nullptr;
-    gatt_client = nullptr;
-    gatt_client_impl = nullptr;
-    security_manager = nullptr;
-    security_manager_impl = nullptr;
-}
-
-class BLEInstanceBase {
-};
-
-BLE::BLE(ble::BLEInstanceBase &transport) : transport(transport)
-{
-}
-
-BLE& BLE::Instance()
-{
-    static ble::BLEInstanceBase transport;
-    static BLE instance(transport);
-    init_mocks();
-    return instance;
-}
-
-ble::Gap &BLE::gap()
-{
-    init_mocks();
-    return *ble::gap;
-}
-
-ble::GattServer &BLE::gattServer()
-{
-    init_mocks();
-    return *ble::gatt_server;
-}
-
-ble::GattClient &BLE::gattClient()
-{
-    init_mocks();
-    return *ble::gatt_client;
-}
-
-ble::SecurityManager &BLE::securityManager()
-{
-    init_mocks();
-    return *ble::security_manager;
-}
-
-const ble::Gap &BLE::gap() const
-{
-    auto &self = const_cast<BLE &>(*this);
-    return const_cast<const ble::Gap &>(self.gap());
-}
-
-const ble::GattServer &BLE::gattServer() const
-{
-    auto &self = const_cast<BLE &>(*this);
-    return const_cast<const ble::GattServer &>(self.gattServer());
-}
-
-const ble::GattClient &BLE::gattClient() const
-{
-    auto &self = const_cast<BLE &>(*this);
-    return const_cast<const ble::GattClient &>(self.gattClient());
-}
-
-const ble::SecurityManager &BLE::securityManager() const
-{
-    auto &self = const_cast<BLE &>(*this);
-    return const_cast<const ble::SecurityManager &>(self.securityManager());
-}
-
-void BLE::processEvents()
-{
-
-}
-
-}
diff --git a/UNITTESTS/fakes/ble/CMakeLists.txt b/UNITTESTS/fakes/ble/CMakeLists.txt
deleted file mode 100644
index c8fb849..0000000
--- a/UNITTESTS/fakes/ble/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-fakes-ble)
-
-target_include_directories(mbed-fakes-ble
-    PUBLIC
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source
-    PRIVATE
-        ${gtest_SOURCE_DIR}/include
-        ${gmock_SOURCE_DIR}/include
-)
-
-target_sources(mbed-fakes-ble
-    PRIVATE
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/AdvertisingParameters.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/ConnectionParameters.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gatt/DiscoveredCharacteristic.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/Gap.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattClient.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattServer.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/SecurityManager.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/BLE.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/ble_mocks.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GapImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GattClientImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GattServerImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
-)
-
-target_link_libraries(mbed-fakes-ble
-    PRIVATE
-        mbed-headers
-        mbed-stubs-headers
-        gcov
-)
diff --git a/UNITTESTS/fakes/ble/GapImpl_mock.h b/UNITTESTS/fakes/ble/GapImpl_mock.h
deleted file mode 100644
index 6ef5aba..0000000
--- a/UNITTESTS/fakes/ble/GapImpl_mock.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GAPMOCK_H
-#define BLE_GAPMOCK_H
-
-#include "gmock/gmock.h"
-#include "source/generic/GapImpl.h"
-
-namespace ble {
-
-class GapMock : public ble::impl::Gap {
-public:
-    GapMock() {};
-    GapMock(const GapMock&) = delete;
-    GapMock& operator=(const GapMock&) = delete;
-    virtual ~GapMock() {};
-
-    MOCK_METHOD((ble_error_t), reset, (), (override));
-    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
-    MOCK_METHOD(bool, isFeatureSupported, (controller_supported_features_t feature), (override));
-    MOCK_METHOD(uint8_t, getMaxAdvertisingSetNumber, (), (override));
-    MOCK_METHOD(uint16_t, getMaxAdvertisingDataLength, (), (override));
-    MOCK_METHOD(uint16_t, getMaxConnectableAdvertisingDataLength, (), (override));
-    MOCK_METHOD(uint16_t, getMaxActiveSetAdvertisingDataLength, (), (override));
-    MOCK_METHOD(ble_error_t, createAdvertisingSet, (advertising_handle_t *handle, const AdvertisingParameters &parameters), (override));
-    MOCK_METHOD(ble_error_t, destroyAdvertisingSet, (advertising_handle_t handle), (override));
-    MOCK_METHOD(ble_error_t, setAdvertisingParameters, (advertising_handle_t handle, const AdvertisingParameters &params), (override));
-    MOCK_METHOD(ble_error_t, setAdvertisingPayload, (advertising_handle_t handle, mbed::Span<const uint8_t> payload), (override));
-    MOCK_METHOD(ble_error_t, setAdvertisingScanResponse, (advertising_handle_t handle, mbed::Span<const uint8_t> response), (override));
-    MOCK_METHOD(ble_error_t, startAdvertising, (advertising_handle_t handle, adv_duration_t maxDuration, uint8_t maxEvents), (override));
-    MOCK_METHOD(ble_error_t, stopAdvertising, (advertising_handle_t handle), (override));
-    MOCK_METHOD(bool, isAdvertisingActive, (advertising_handle_t handle), (override));
-    MOCK_METHOD(ble_error_t, setPeriodicAdvertisingParameters, (advertising_handle_t handle, periodic_interval_t periodicAdvertisingIntervalMin, periodic_interval_t periodicAdvertisingIntervalMax, bool advertiseTxPower), (override));
-    MOCK_METHOD(ble_error_t, setPeriodicAdvertisingPayload, (advertising_handle_t handle, mbed::Span<const uint8_t> payload), (override));
-    MOCK_METHOD(ble_error_t, startPeriodicAdvertising, (advertising_handle_t handle), (override));
-    MOCK_METHOD(ble_error_t, stopPeriodicAdvertising, (advertising_handle_t handle), (override));
-    MOCK_METHOD(bool, isPeriodicAdvertisingActive, (advertising_handle_t handle), (override));
-    MOCK_METHOD(ble_error_t, setScanParameters, (const ScanParameters &params), (override));
-    MOCK_METHOD(ble_error_t, startScan, (scan_duration_t duration, duplicates_filter_t filtering, scan_period_t period), (override));
-    MOCK_METHOD(ble_error_t, initiate_scan, (), (override));
-    MOCK_METHOD(ble_error_t, stopScan, (), (override));
-    MOCK_METHOD(ble_error_t, createSync, (peer_address_type_t peerAddressType, const address_t &peerAddress, uint8_t sid, slave_latency_t maxPacketSkip, sync_timeout_t timeout), (override));
-    MOCK_METHOD(ble_error_t, createSync, (slave_latency_t maxPacketSkip, sync_timeout_t timeout), (override));
-    MOCK_METHOD(ble_error_t, cancelCreateSync, (), (override));
-    MOCK_METHOD(ble_error_t, terminateSync, (periodic_sync_handle_t handle), (override));
-    MOCK_METHOD(ble_error_t, addDeviceToPeriodicAdvertiserList, (peer_address_type_t peerAddressType, const address_t &peerAddress, advertising_sid_t sid), (override));
-    MOCK_METHOD(ble_error_t, removeDeviceFromPeriodicAdvertiserList, (peer_address_type_t peerAddressType, const address_t &peerAddress, advertising_sid_t sid), (override));
-    MOCK_METHOD(ble_error_t, clearPeriodicAdvertiserList, (), (override));
-    MOCK_METHOD(ble_error_t, connect, (peer_address_type_t peerAddressType, const address_t &peerAddress, const ConnectionParameters &connectionParams), (override));
-    MOCK_METHOD(ble_error_t, cancelConnect, (), (override));
-    MOCK_METHOD(ble_error_t, updateConnectionParameters, (connection_handle_t connectionHandle, conn_interval_t minConnectionInterval, conn_interval_t maxConnectionInterval, slave_latency_t slaveLatency, supervision_timeout_t supervision_timeout, conn_event_length_t minConnectionEventLength, conn_event_length_t maxConnectionEventLength), (override));
-    MOCK_METHOD(ble_error_t, manageConnectionParametersUpdateRequest, (bool userManageConnectionUpdateRequest), (override));
-    MOCK_METHOD(ble_error_t, acceptConnectionParametersUpdate, (connection_handle_t connectionHandle, conn_interval_t minConnectionInterval, conn_interval_t maxConnectionInterval, slave_latency_t slaveLatency, supervision_timeout_t supervision_timeout, conn_event_length_t minConnectionEventLength, conn_event_length_t maxConnectionEventLength), (override));
-    MOCK_METHOD(ble_error_t, rejectConnectionParametersUpdate, (connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, disconnect, (connection_handle_t connectionHandle, local_disconnection_reason_t reason), (override));
-    MOCK_METHOD(ble_error_t, readPhy, (connection_handle_t connection), (override));
-    MOCK_METHOD(ble_error_t, setPreferredPhys, (const phy_set_t *txPhys, const phy_set_t *rxPhys), (override));
-    MOCK_METHOD(ble_error_t, setPhy, (connection_handle_t connection, const phy_set_t *txPhys, const phy_set_t *rxPhys, coded_symbol_per_bit_t codedSymbol), (override));
-    MOCK_METHOD(ble_error_t, enablePrivacy, (bool enable), (override));
-    MOCK_METHOD(ble_error_t, setPeripheralPrivacyConfiguration, (const peripheral_privacy_configuration_t *configuration), (override));
-    MOCK_METHOD(ble_error_t, getPeripheralPrivacyConfiguration, (peripheral_privacy_configuration_t *configuration), (override));
-    MOCK_METHOD(ble_error_t, setCentralPrivacyConfiguration, (const central_privacy_configuration_t *configuration), (override));
-    MOCK_METHOD(ble_error_t, getCentralPrivacyConfiguration, (central_privacy_configuration_t *configuration), (override));
-    MOCK_METHOD(uint8_t, getMaxWhitelistSize, (), (const, override));
-    MOCK_METHOD(ble_error_t, getWhitelist, (whitelist_t &whitelist), (const, override));
-    MOCK_METHOD(ble_error_t, setWhitelist, (const whitelist_t &whitelist), (override));
-    MOCK_METHOD(ble_error_t, getAddress, (own_address_type_t &typeP, address_t &address), (override));
-    MOCK_METHOD(void, onShutdown, (const GapShutdownCallback_t &callback), (override));
-    MOCK_METHOD(GapShutdownCallbackChain_t&, onShutdown, (), (override));
-    MOCK_METHOD(ble_error_t, setRandomStaticAddress, (const ble::address_t &address), (override));
-    MOCK_METHOD(ble::address_t, getRandomStaticAddress, (), (override));
-};
-
-}
-
-#endif //BLE_GAPMOCK_H
diff --git a/UNITTESTS/fakes/ble/GattClientImpl_mock.h b/UNITTESTS/fakes/ble/GattClientImpl_mock.h
deleted file mode 100644
index d0221a5..0000000
--- a/UNITTESTS/fakes/ble/GattClientImpl_mock.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GATTCLIENTMOCK_H
-#define BLE_GATTCLIENTMOCK_H
-
-#include "gmock/gmock.h"
-#include "source/generic/GattClientImpl.h"
-
-namespace ble {
-
-class GattClientMock : public ble::impl::GattClient {
-public:
-    GattClientMock() {};
-    GattClientMock(const GattClientMock&) = delete;
-    GattClientMock& operator=(const GattClientMock&) = delete;
-    virtual ~GattClientMock() {};
-
-    MOCK_METHOD(ble_error_t, reset, (), (override));
-    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
-    MOCK_METHOD(ble_error_t, launchServiceDiscovery, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t sc, ServiceDiscovery::CharacteristicCallback_t cc, const UUID &matchingServiceUUID, const UUID &matchingCharacteristicUUIDIn), (override));
-    MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, const UUID &matchingServiceUUID), (override));
-    MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, GattAttribute::Handle_t startHandle, GattAttribute::Handle_t endHandle), (override));
-    MOCK_METHOD(bool, isServiceDiscoveryActive, (), (const, override));
-    MOCK_METHOD(void, terminateServiceDiscovery, (), (override));
-    MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, uint16_t offset), (const, override));
-    MOCK_METHOD(ble_error_t, write, (GattClient::WriteOp_t cmd, ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, size_t length, const uint8_t *value), (const, override));
-    MOCK_METHOD(void, onDataRead, (ReadCallback_t callback), (override));
-    MOCK_METHOD(ReadCallbackChain_t&, onDataRead, (), (override));
-    MOCK_METHOD(void, onDataWritten, (WriteCallback_t callback), (override));
-    MOCK_METHOD(WriteCallbackChain_t&, onDataWritten, (), (override));
-    MOCK_METHOD(void, onServiceDiscoveryTermination, (ServiceDiscovery::TerminationCallback_t callback), (override));
-    MOCK_METHOD(ble_error_t, discoverCharacteristicDescriptors, (const DiscoveredCharacteristic &characteristic, const CharacteristicDescriptorDiscovery::DiscoveryCallback_t &discoveryCallback, const CharacteristicDescriptorDiscovery::TerminationCallback_t &terminationCallback), (override));
-    MOCK_METHOD(bool, isCharacteristicDescriptorDiscoveryActive, (const DiscoveredCharacteristic &characteristic), (const, override));
-    MOCK_METHOD(void, terminateCharacteristicDescriptorDiscovery, (const DiscoveredCharacteristic &characteristic), (override));
-    MOCK_METHOD(ble_error_t, negotiateAttMtu, (ble::connection_handle_t connection), (override));
-    MOCK_METHOD(void, onHVX, (HVXCallback_t callback), (override));
-    MOCK_METHOD(void, onShutdown, (const GattClientShutdownCallback_t &callback), (override));
-    MOCK_METHOD(GattClientShutdownCallbackChain_t&, onShutdown, (), (override));
-    MOCK_METHOD(HVXCallbackChain_t&, onHVX, (), (override));
-    MOCK_METHOD(void, processReadResponse, (const GattReadCallbackParams *params), (override));
-    MOCK_METHOD(void, processWriteResponse, (const GattWriteCallbackParams *params), (override));
-    MOCK_METHOD(void, processHVXEvent, (const GattHVXCallbackParams *params), (override));
-};
-
-}
-
-#endif //BLE_GATTCLIENTMOCK_H
diff --git a/UNITTESTS/fakes/ble/GattServerImpl_mock.h b/UNITTESTS/fakes/ble/GattServerImpl_mock.h
deleted file mode 100644
index 527a71f..0000000
--- a/UNITTESTS/fakes/ble/GattServerImpl_mock.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GATTSERVERMOCK_H
-#define BLE_GATTSERVERMOCK_H
-
-#include "gmock/gmock.h"
-#include "source/GattServerImpl.h"
-
-namespace ble {
-
-class GattServerMock : public ble::impl::GattServer {
-public:
-    GattServerMock();
-    GattServerMock(const GattServerMock&) = delete;
-    GattServerMock& operator=(const GattServerMock&) = delete;
-    virtual ~GattServerMock();
-
-    MOCK_METHOD(ble_error_t, reset, (ble::GattServer* server), (override));
-    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
-    MOCK_METHOD(ble_error_t, addService, (GattService &service), (override));
-    MOCK_METHOD(ble_error_t, read, (GattAttribute::Handle_t attributeHandle, uint8_t buffer[], uint16_t *lengthP), (override));
-    MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, uint8_t *buffer, uint16_t *lengthP), (override));
-    MOCK_METHOD(ble_error_t, write, (GattAttribute::Handle_t attributeHandle, const uint8_t *value, uint16_t size, bool localOnly), (override));
-    MOCK_METHOD(ble_error_t, write, (ble::connection_handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, const uint8_t *value, uint16_t size, bool localOnly), (override));
-    MOCK_METHOD(ble_error_t, areUpdatesEnabled, (const GattCharacteristic &characteristic, bool *enabledP), (override));
-    MOCK_METHOD(ble_error_t, areUpdatesEnabled, (ble::connection_handle_t connectionHandle, const GattCharacteristic &characteristic, bool *enabledP), (override));
-    MOCK_METHOD(ble::Gap::PreferredConnectionParams_t, getPreferredConnectionParams, (), (override));
-    MOCK_METHOD(void, setPreferredConnectionParams, (const ble::Gap::PreferredConnectionParams_t &params), (override));
-    MOCK_METHOD(bool, isOnDataReadAvailable, (), (const, override));
-    MOCK_METHOD(void, onDataSent, (const DataSentCallback_t &callback), (override));
-    MOCK_METHOD(DataSentCallbackChain_t&, onDataSent, (), (override));
-    MOCK_METHOD(void, onDataWritten, (const DataWrittenCallback_t &callback), (override));
-    MOCK_METHOD(DataWrittenCallbackChain_t&, onDataWritten, (), (override));
-    MOCK_METHOD(ble_error_t, onDataRead, (const DataReadCallback_t &callback), (override));
-    MOCK_METHOD(DataReadCallbackChain_t&, onDataRead, (), (override));
-    MOCK_METHOD(void, onShutdown, (const GattServerShutdownCallback_t &callback), (override));
-    MOCK_METHOD(GattServerShutdownCallbackChain_t&, onShutdown, (), (override));
-    MOCK_METHOD(void, onUpdatesEnabled, (EventCallback_t callback), (override));
-    MOCK_METHOD(void, onUpdatesDisabled, (EventCallback_t callback), (override));
-    MOCK_METHOD(void, onConfirmationReceived, (EventCallback_t callback), (override));
-    MOCK_METHOD(void, handleDataWrittenEvent, (const GattWriteCallbackParams *params), (override));
-    MOCK_METHOD(void, handleDataReadEvent, (const GattReadCallbackParams *params), (override));
-    MOCK_METHOD(void, handleEvent, (GattServerEvents::gattEvent_e type, ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle), (override));
-    MOCK_METHOD(void, handleDataSentEvent, (unsigned count), (override));
-
-    // Fake part
-    // Descriptor representation of a descriptor registered with ble::test::register_services
-    struct descriptor_t {
-        UUID uuid;
-        ble::attribute_handle_t handle;
-        ble::att_security_requirement_t read_security = ble::att_security_requirement_t::NONE;
-        ble::att_security_requirement_t write_security = ble::att_security_requirement_t::NONE;
-        bool is_readable;
-        bool is_writable;
-        std::vector<uint8_t> value;   // Use capacity to determine the max size.
-    };
-
-    // Characteristic representation of a characteristic registered with ble::test::register_services
-    struct characteristic_t {
-        UUID uuid;
-        ble::attribute_handle_t value_handle;
-        uint8_t properties;
-        ble::att_security_requirement_t read_security = ble::att_security_requirement_t::NONE;
-        ble::att_security_requirement_t write_security = ble::att_security_requirement_t::NONE;
-        ble::att_security_requirement_t update_security = ble::att_security_requirement_t::NONE;
-        FunctionPointerWithContext<GattReadAuthCallbackParams *>
-            read_cb;
-        FunctionPointerWithContext<GattWriteAuthCallbackParams *>
-            write_cb;
-        bool has_variable_len;
-        std::vector<uint8_t> value;   // Use capacity to determine the max size.
-        std::vector<descriptor_t> descriptors;
-    };
-
-    // Service representation of a service registered with ble::test::register_services
-    struct service_t {
-        UUID uuid;
-        ble::attribute_handle_t handle;
-        std::vector<characteristic_t> characteristics;
-    };
-
-    void fake_register_services(GattService& gattService);
-
-    std::vector<service_t> services;
-    ble::attribute_handle_t current_handle = 1;
-};
-
-}
-
-#endif //BLE_GATTSERVERMOCK_H
diff --git a/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h b/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
deleted file mode 100644
index d0fd452..0000000
--- a/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SECURITYMANAGERMOCK_H
-#define SECURITYMANAGERMOCK_H
-
-#include "gmock/gmock.h"
-#include "source/generic/SecurityManagerImpl.h"
-
-namespace ble {
-
-class SecurityManagerMock : public ble::impl::SecurityManager {
-public:
-    SecurityManagerMock() {};
-    SecurityManagerMock(const GattServerMock&) = delete;
-    SecurityManagerMock& operator=(const GattServerMock&) = delete;
-    virtual ~SecurityManagerMock() {};
-
-    MOCK_METHOD(ble_error_t, reset, (), (override));
-    MOCK_METHOD(ble_error_t, init, (bool enableBonding, bool requireMITM, SecurityIOCapabilities_t iocaps, const Passkey_t passkey, bool signing, const char *dbFilepath), (override));
-    MOCK_METHOD(ble_error_t, setDatabaseFilepath, (const char *dbFilepath), (override));
-    MOCK_METHOD(ble_error_t, preserveBondingStateOnReset, (bool enable), (override));
-    MOCK_METHOD(ble_error_t, writeBondingStateToPersistentStorage, (), (override));
-    MOCK_METHOD(ble_error_t, purgeAllBondingState, (), (override));
-    MOCK_METHOD(ble_error_t, generateWhitelistFromBondTable, (::ble::whitelist_t *whitelist), (const, override));
-    MOCK_METHOD(ble_error_t, requestPairing, (ble::connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, acceptPairingRequest, (ble::connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, cancelPairingRequest, (ble::connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, setPairingRequestAuthorisation, (bool required), (override));
-    MOCK_METHOD(ble_error_t, getPeerIdentity, (ble::connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, allowLegacyPairing, (bool allow), (override));
-    MOCK_METHOD(ble_error_t, getSecureConnectionsSupport, (bool *enabled), (override));
-    MOCK_METHOD(ble_error_t, setIoCapability, (SecurityIOCapabilities_t iocaps), (override));
-    MOCK_METHOD(ble_error_t, setDisplayPasskey, (const Passkey_t passkey), (override));
-    MOCK_METHOD(ble_error_t, setLinkSecurity, (ble::connection_handle_t connectionHandle, SecurityMode_t securityMode), (override));
-    MOCK_METHOD(ble_error_t, setKeypressNotification, (bool enabled), (override));
-    MOCK_METHOD(ble_error_t, enableSigning, (ble::connection_handle_t connectionHandle, bool enabled), (override));
-    MOCK_METHOD(ble_error_t, setHintFutureRoleReversal, (bool enable), (override));
-    MOCK_METHOD(ble_error_t, getLinkEncryption, (ble::connection_handle_t connectionHandle, ble::link_encryption_t *encryption), (override));
-    MOCK_METHOD(ble_error_t, setLinkEncryption, (ble::connection_handle_t connectionHandle, ble::link_encryption_t encryption), (override));
-    MOCK_METHOD(ble_error_t, setEncryptionKeyRequirements, (uint8_t minimumByteSize, uint8_t maximumByteSize), (override));
-    MOCK_METHOD(ble_error_t, getEncryptionKeySize, (connection_handle_t connectionHandle, uint8_t *size), (override));
-    MOCK_METHOD(ble_error_t, requestAuthentication, (ble::connection_handle_t connectionHandle), (override));
-    MOCK_METHOD(ble_error_t, generateOOB, (const ble::address_t *address), (override));
-    MOCK_METHOD(ble_error_t, setOOBDataUsage, (ble::connection_handle_t connectionHandle, bool useOOB, bool OOBProvidesMITM), (override));
-    MOCK_METHOD(ble_error_t, passkeyEntered, (ble::connection_handle_t connectionHandle, Passkey_t passkey), (override));
-    MOCK_METHOD(ble_error_t, legacyPairingOobReceived, (const ble::address_t *address, const ble::oob_tk_t *tk), (override));
-    MOCK_METHOD(ble_error_t, confirmationEntered, (ble::connection_handle_t connectionHandle, bool confirmation), (override));
-    MOCK_METHOD(ble_error_t, sendKeypressNotification, (ble::connection_handle_t connectionHandle, ble::Keypress_t keypress), (override));
-    MOCK_METHOD(ble_error_t, oobReceived, (const ble::address_t *address, const ble::oob_lesc_value_t *random, const ble::oob_confirm_t *confirm), (override));
-    MOCK_METHOD(ble_error_t, getSigningKey, (ble::connection_handle_t connectionHandle, bool authenticated), (override));
-    MOCK_METHOD(ble_error_t, setPrivateAddressTimeout, (uint16_t timeout_in_seconds), (override));
-    MOCK_METHOD(void, onShutdown, (const SecurityManagerShutdownCallback_t &callback), (override));
-    MOCK_METHOD(SecurityManagerShutdownCallbackChain_t&, onShutdown, (), (override));
-    MOCK_METHOD(void, setSecurityManagerEventHandler, (EventHandler *handler), (override));
-};
-
-}
-
-#endif //SECURITYMANAGERMOCK_H
diff --git a/UNITTESTS/fakes/ble/ble_mocks.h b/UNITTESTS/fakes/ble/ble_mocks.h
deleted file mode 100644
index 2f927a7..0000000
--- a/UNITTESTS/fakes/ble/ble_mocks.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_MOCKS_H
-#define BLE_MOCKS_H
-
-#include "GattServerImpl_mock.h"
-#include "GattClientImpl_mock.h"
-#include "GapImpl_mock.h"
-#include "SecurityManagerImpl_mock.h"
-
-/***
- * You must use delete_mocks() at the end of the test. BLE::Instance(), ble::gap() etc. inits the mocks. Do not cache
- * pointers between tests. Call BLE::Instance() at the start of the tests, otherwise call init_mocks() yourself.
- * To access mocks use:
- * gap_mock(), gatt_server_mock(), gatt_client_mock(), security_manager_mock().
- * All functions are in namespace ble.
- */
-namespace ble {
-
-void init_mocks();
-void delete_mocks();
-
-GapMock& gap_mock();
-GattServerMock& gatt_server_mock();
-GattClientMock& gatt_client_mock();
-SecurityManagerMock& security_manager_mock();
-
-}
-
-#endif // BLE_MOCKS_H
diff --git a/UNITTESTS/fakes/ble/source/GattServerImpl.h b/UNITTESTS/fakes/ble/source/GattServerImpl.h
deleted file mode 100644
index 6583a33..0000000
--- a/UNITTESTS/fakes/ble/source/GattServerImpl.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GATTSERVERSTUB_H
-#define BLE_GATTSERVERSTUB_H
-
-#include "ble/GattServer.h"
-#include "generic/GattServerEvents.h"
-#include "ble/Gap.h"
-
-namespace ble {
-namespace impl {
-
-class GattServer {
-public:
-    GattServer() {};
-    GattServer(const GattServer&) = delete;
-    GattServer& operator=(const GattServer&) = delete;
-    virtual ~GattServer() {};
-
-    using EventHandler = ble::GattServer::EventHandler;
-    using DataSentCallback_t = ble::GattServer::DataSentCallback_t ;
-    using DataSentCallbackChain_t = ble::GattServer::DataSentCallbackChain_t ;
-    using DataWrittenCallback_t = ble::GattServer::DataWrittenCallback_t ;
-    using DataWrittenCallbackChain_t = ble::GattServer::DataWrittenCallbackChain_t ;
-    using DataReadCallback_t = ble::GattServer::DataReadCallback_t;
-    using DataReadCallbackChain_t = ble::GattServer::DataReadCallbackChain_t;
-    using GattServerShutdownCallback_t = ble::GattServer::GattServerShutdownCallback_t;
-    using GattServerShutdownCallbackChain_t = ble::GattServer::GattServerShutdownCallbackChain_t;
-    using EventCallback_t = ble::GattServer::EventCallback_t;
-
-    virtual void setEventHandler(EventHandler *handler) { };
-
-    virtual ble_error_t reset(ble::GattServer* server) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t addService(GattService &service) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t read(
-        GattAttribute::Handle_t attributeHandle,
-        uint8_t buffer[],
-        uint16_t *lengthP
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t read(
-        ble::connection_handle_t connectionHandle,
-        GattAttribute::Handle_t attributeHandle,
-        uint8_t *buffer,
-        uint16_t *lengthP
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t write(
-        GattAttribute::Handle_t attributeHandle,
-        const uint8_t *value,
-        uint16_t size,
-        bool localOnly = false
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t write(
-        ble::connection_handle_t connectionHandle,
-        GattAttribute::Handle_t attributeHandle,
-        const uint8_t *value,
-        uint16_t size,
-        bool localOnly = false
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t areUpdatesEnabled(
-        const GattCharacteristic &characteristic,
-        bool *enabledP
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t areUpdatesEnabled(
-        ble::connection_handle_t connectionHandle,
-        const GattCharacteristic &characteristic,
-        bool *enabledP
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble::Gap::PreferredConnectionParams_t getPreferredConnectionParams() {
-        ble::Gap::PreferredConnectionParams_t params = {0}; return params;
-    };
-
-    virtual void setPreferredConnectionParams(const ble::Gap::PreferredConnectionParams_t &params) { };
-
-    virtual bool isOnDataReadAvailable() const { return true; };
-
-    virtual void onDataSent(const DataSentCallback_t &callback) { };
-
-    virtual DataSentCallbackChain_t &onDataSent() { static DataSentCallbackChain_t chain; return chain; };
-
-    virtual void onDataWritten(const DataWrittenCallback_t &callback) { };
-
-    virtual DataWrittenCallbackChain_t &onDataWritten() { static DataWrittenCallbackChain_t chain; return chain; };
-
-    virtual ble_error_t onDataRead(const DataReadCallback_t &callback) { return BLE_ERROR_NONE; };
-
-    virtual DataReadCallbackChain_t &onDataRead() { static DataReadCallbackChain_t chain; return chain; };
-
-    virtual void onShutdown(const GattServerShutdownCallback_t &callback) { };
-
-    virtual GattServerShutdownCallbackChain_t &onShutdown() { static GattServerShutdownCallbackChain_t chain; return chain; };
-
-    virtual void onUpdatesEnabled(EventCallback_t callback) { };
-
-    virtual void onUpdatesDisabled(EventCallback_t callback) { };
-
-    virtual void onConfirmationReceived(EventCallback_t callback) { };
-
-    virtual void handleDataWrittenEvent(const GattWriteCallbackParams *params) { };
-
-    virtual void handleDataReadEvent(const GattReadCallbackParams *params) { };
-
-    virtual void handleEvent(
-        GattServerEvents::gattEvent_e type,
-        ble::connection_handle_t connHandle,
-        GattAttribute::Handle_t attributeHandle
-    ) { };
-
-    virtual void handleDataSentEvent(unsigned count) { };
-};
-
-}
-}
-
-#endif //BLE_GATTSERVERSTUB_H
diff --git a/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp b/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
deleted file mode 100644
index de6fdf1..0000000
--- a/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2021 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GattServerImpl_mock.h"
-
-namespace ble {
-
-GattServerMock::GattServerMock()
-{
-    ON_CALL(*this, addService).WillByDefault([this](GattService &service) {
-        // Fake registration, it populates the handles of the input and store its
-        // representation in the services field.
-        fake_register_services(service);
-        return BLE_ERROR_NONE;
-    });
-}
-
-GattServerMock::~GattServerMock() {};
-
-void GattServerMock::fake_register_services(GattService& gattService)
-{
-    gattService.setHandle(current_handle++);
-    service_t result {
-        gattService.getUUID(),
-        gattService.getHandle()
-    };
-
-    for (size_t i = 0; i < gattService.getCharacteristicCount(); ++i) {
-        current_handle++; // Increment for the characteristic declaration handle
-        auto& ref = *gattService.getCharacteristic(i);
-        ref.getValueAttribute().setHandle(current_handle++);
-
-        characteristic_t c;
-        c.uuid = ref.getValueAttribute().getUUID();
-        c.value_handle = ref.getValueHandle();
-        c.properties = ref.getProperties();
-        c.read_security = ref.getReadSecurityRequirement();
-        c.write_security = ref.getWriteSecurityRequirement();
-        c.update_security = ref.getUpdateSecurityRequirement();
-        c.read_cb = ref.getReadAuthorizationCallback();
-        c.write_cb = ref.getWriteAuthorizationCallback();
-        c.value.reserve(ref.getValueAttribute().getMaxLength());
-        c.value.resize(ref.getValueAttribute().getLength());
-        {
-            auto value_ptr = ref.getValueAttribute().getValuePtr();
-            if (value_ptr) {
-                std::copy(value_ptr, value_ptr + c.value.size(), c.value.begin());
-            }
-        }
-        c.has_variable_len = ref.getValueAttribute().hasVariableLength();
-
-        for (size_t j = 0; j < ref.getDescriptorCount(); ++j) {
-            auto& ref_desc = *ref.getDescriptor(j);
-            ref_desc.setHandle(current_handle++);
-
-            descriptor_t d;
-            d.uuid = ref_desc.getUUID();
-            d.handle = ref_desc.getHandle();
-            d.read_security = ref_desc.getReadSecurityRequirement();
-            d.write_security = ref_desc.getWriteSecurityRequirement();
-            d.is_readable = ref_desc.isReadAllowed();
-            d.is_writable = ref_desc.isWriteAllowed();
-            d.value.reserve(ref_desc.getMaxLength());
-            d.value.resize(ref_desc.getLength());
-            {
-                auto value_ptr = ref_desc.getValuePtr();
-                if (value_ptr) {
-                    std::copy(value_ptr, value_ptr + d.value.size(), d.value.begin());
-                }
-            }
-
-            c.descriptors.push_back(d);
-        }
-
-        result.characteristics.push_back(c);
-    }
-
-    services.push_back(result);
-}
-
-
-}
diff --git a/UNITTESTS/fakes/ble/source/generic/GapImpl.h b/UNITTESTS/fakes/ble/source/generic/GapImpl.h
deleted file mode 100644
index 64704ef..0000000
--- a/UNITTESTS/fakes/ble/source/generic/GapImpl.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GAPSTUB_H
-#define BLE_GAPSTUB_H
-
-namespace ble {
-namespace impl {
-
-class Gap {
-public:
-    Gap() {};
-    Gap(const Gap&) = delete;
-    Gap& operator=(const Gap&) = delete;
-    virtual ~Gap() {};
-
-    using EventHandler = ::ble::Gap::EventHandler;
-    using GapShutdownCallback_t = ::ble::Gap::GapShutdownCallback_t;
-    using GapShutdownCallbackChain_t  = ::ble::Gap::GapShutdownCallbackChain_t ;
-    using PreferredConnectionParams_t = ::ble::Gap::PreferredConnectionParams_t ;
-
-#if BLE_FEATURE_PRIVACY
-#if BLE_ROLE_BROADCASTER
-    static const peripheral_privacy_configuration_t default_peripheral_privacy_configuration;
-#endif // BLE_ROLE_BROADCASTER
-
-#if BLE_ROLE_OBSERVER
-    /**
-     * Default peripheral privacy configuration.
-     */
-    static const central_privacy_configuration_t default_central_privacy_configuration;
-#endif // BLE_ROLE_OBSERVER
-#endif // BLE_FEATURE_PRIVACY
-
-public:
-    virtual void setEventHandler(EventHandler *handler) { };
-
-    virtual bool isFeatureSupported(controller_supported_features_t feature) { return true; };
-
-    /*                                     advertising                                           */
-#if BLE_ROLE_BROADCASTER
-
-    virtual uint8_t getMaxAdvertisingSetNumber() { return 1; };
-
-    virtual uint16_t getMaxAdvertisingDataLength() { return 23; };
-
-    virtual uint16_t getMaxConnectableAdvertisingDataLength() {  return 21; };
-
-    virtual uint16_t getMaxActiveSetAdvertisingDataLength() {  return 21; };
-
-#if BLE_FEATURE_EXTENDED_ADVERTISING
-
-    virtual ble_error_t createAdvertisingSet(
-        advertising_handle_t *handle,
-        const AdvertisingParameters &parameters
-    ) {  return BLE_ERROR_NONE; };
-
-    virtual ble_error_t destroyAdvertisingSet(advertising_handle_t handle) { return BLE_ERROR_NONE; };
-
-#endif // BLE_FEATURE_EXTENDED_ADVERTISING
-
-    virtual ble_error_t setAdvertisingParameters(
-        advertising_handle_t handle,
-        const AdvertisingParameters &params
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setAdvertisingPayload(
-        advertising_handle_t handle,
-        mbed::Span<const uint8_t> payload
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setAdvertisingScanResponse(
-        advertising_handle_t handle,
-        mbed::Span<const uint8_t> response
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t startAdvertising(
-        advertising_handle_t handle,
-        adv_duration_t maxDuration = adv_duration_t::forever(),
-        uint8_t maxEvents = 0
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t stopAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
-
-    virtual bool isAdvertisingActive(advertising_handle_t handle) { return true; };
-
-#endif // BLE_ROLE_BROADCASTER
-
-#if BLE_ROLE_BROADCASTER
-#if BLE_FEATURE_PERIODIC_ADVERTISING
-
-    virtual ble_error_t setPeriodicAdvertisingParameters(
-        advertising_handle_t handle,
-        periodic_interval_t periodicAdvertisingIntervalMin,
-        periodic_interval_t periodicAdvertisingIntervalMax,
-        bool advertiseTxPower = true
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setPeriodicAdvertisingPayload(
-        advertising_handle_t handle,
-        mbed::Span<const uint8_t> payload
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t startPeriodicAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t stopPeriodicAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
-
-    virtual bool isPeriodicAdvertisingActive(advertising_handle_t handle) { return true; };
-
-#endif // BLE_ROLE_BROADCASTER
-#endif // BLE_FEATURE_PERIODIC_ADVERTISING
-
-    /*                                     scanning                                              */
-#if BLE_ROLE_OBSERVER
-
-    virtual ble_error_t setScanParameters(const ScanParameters &params) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t startScan(
-        scan_duration_t duration = scan_duration_t::forever(),
-        duplicates_filter_t filtering = duplicates_filter_t::DISABLE,
-        scan_period_t period = scan_period_t(0)
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t initiate_scan() { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t stopScan() { return BLE_ERROR_NONE; };
-
-#endif // BLE_ROLE_OBSERVER
-
-#if BLE_ROLE_OBSERVER
-#if BLE_FEATURE_PERIODIC_ADVERTISING
-
-    virtual ble_error_t createSync(
-        peer_address_type_t peerAddressType,
-        const address_t &peerAddress,
-        uint8_t sid,
-        slave_latency_t maxPacketSkip,
-        sync_timeout_t timeout
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t createSync(
-        slave_latency_t maxPacketSkip,
-        sync_timeout_t timeout
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t cancelCreateSync() { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t terminateSync(periodic_sync_handle_t handle) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t addDeviceToPeriodicAdvertiserList(
-        peer_address_type_t peerAddressType,
-        const address_t &peerAddress,
-        advertising_sid_t sid
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t removeDeviceFromPeriodicAdvertiserList(
-            peer_address_type_t peerAddressType,
-            const address_t &peerAddress,
-            advertising_sid_t sid
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t clearPeriodicAdvertiserList() { return BLE_ERROR_NONE; };
-
-    uint8_t getMaxPeriodicAdvertiserListSize() { return 1; };
-
-#endif // BLE_ROLE_OBSERVER
-#endif // BLE_FEATURE_PERIODIC_ADVERTISING
-
-#if BLE_ROLE_CENTRAL
-
-    virtual ble_error_t connect(
-            peer_address_type_t peerAddressType,
-            const address_t &peerAddress,
-            const ConnectionParameters &connectionParams
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t cancelConnect() { return BLE_ERROR_NONE; };
-
-#endif // BLE_ROLE_CENTRAL
-
-#if BLE_FEATURE_CONNECTABLE
-
-    virtual ble_error_t updateConnectionParameters(
-        connection_handle_t connectionHandle,
-        conn_interval_t minConnectionInterval,
-        conn_interval_t maxConnectionInterval,
-        slave_latency_t slaveLatency,
-        supervision_timeout_t supervision_timeout,
-        conn_event_length_t minConnectionEventLength = conn_event_length_t(0),
-        conn_event_length_t maxConnectionEventLength = conn_event_length_t(0)
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t manageConnectionParametersUpdateRequest(
-        bool userManageConnectionUpdateRequest
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t acceptConnectionParametersUpdate(
-        connection_handle_t connectionHandle,
-        conn_interval_t minConnectionInterval,
-        conn_interval_t maxConnectionInterval,
-        slave_latency_t slaveLatency,
-        supervision_timeout_t supervision_timeout,
-        conn_event_length_t minConnectionEventLength = conn_event_length_t(0),
-        conn_event_length_t maxConnectionEventLength = conn_event_length_t(0)
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t rejectConnectionParametersUpdate(
-        connection_handle_t connectionHandle
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t disconnect(
-        connection_handle_t connectionHandle,
-        local_disconnection_reason_t reason
-    ) { return BLE_ERROR_NONE; };
-
-#endif // BLE_FEATURE_CONNECTABLE
-#if BLE_FEATURE_PHY_MANAGEMENT
-
-    virtual ble_error_t readPhy(connection_handle_t connection) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setPreferredPhys(
-        const phy_set_t *txPhys,
-        const phy_set_t *rxPhys
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setPhy(
-        connection_handle_t connection,
-        const phy_set_t *txPhys,
-        const phy_set_t *rxPhys,
-        coded_symbol_per_bit_t codedSymbol
-    ) { return BLE_ERROR_NONE; };
-
-#endif // BLE_FEATURE_PHY_MANAGEMENT
-
-#if BLE_FEATURE_PRIVACY
-
-    virtual ble_error_t enablePrivacy(bool enable) { return BLE_ERROR_NONE; };
-
-#if BLE_ROLE_BROADCASTER
-
-    virtual ble_error_t setPeripheralPrivacyConfiguration(
-        const peripheral_privacy_configuration_t *configuration
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t getPeripheralPrivacyConfiguration(
-        peripheral_privacy_configuration_t *configuration
-    ) { return BLE_ERROR_NONE; };
-
-#endif // BLE_ROLE_BROADCASTER
-
-#if BLE_ROLE_OBSERVER
-
-    virtual ble_error_t setCentralPrivacyConfiguration(
-        const central_privacy_configuration_t *configuration
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t getCentralPrivacyConfiguration(
-        central_privacy_configuration_t *configuration
-    ) { return BLE_ERROR_NONE; };
-
-#endif // BLE_ROLE_OBSERVER
-#endif // BLE_FEATURE_PRIVACY
-
-#if BLE_FEATURE_WHITELIST
-
-    virtual uint8_t getMaxWhitelistSize() const { return 1; };
-
-    virtual ble_error_t getWhitelist(whitelist_t &whitelist) const { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setWhitelist(const whitelist_t &whitelist) { return BLE_ERROR_NONE; };
-
-#endif // BLE_FEATURE_WHITELIST
-
-    virtual ble_error_t getAddress(
-        own_address_type_t &typeP,
-        address_t &address
-    ) { return BLE_ERROR_NONE; };
-
-    static ble_error_t getRandomAddressType(
-        ble::address_t address,
-        ble::random_address_type_t *addressType
-    ) { return BLE_ERROR_NONE;};
-
-    virtual ble_error_t reset() { return BLE_ERROR_NONE; };
-
-    virtual void onShutdown(const GapShutdownCallback_t &callback) { };
-
-    virtual GapShutdownCallbackChain_t &onShutdown() { static GapShutdownCallbackChain_t chain; return chain; };
-
-    /*
-     * API reserved for the controller driver to set the random static address.
-     * Setting a new random static address while the controller is operating is
-     * forbidden by the Bluetooth specification.
-     */
-    virtual ble_error_t setRandomStaticAddress(const ble::address_t &address) { return BLE_ERROR_NONE; };
-
-    virtual ble::address_t getRandomStaticAddress() { return ble::address_t(); };
-};
-
-}
-}
-
-#endif //BLE_GAPSTUB_H
diff --git a/UNITTESTS/fakes/ble/source/generic/GattClientImpl.h b/UNITTESTS/fakes/ble/source/generic/GattClientImpl.h
deleted file mode 100644
index a0bc5e8..0000000
--- a/UNITTESTS/fakes/ble/source/generic/GattClientImpl.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BLE_GATTCLIENTSTUB_H
-#define BLE_GATTCLIENTSTUB_H
-
-#include "events/EventQueue.h"
-
-namespace ble {
-namespace impl {
-
-class GattClient {
-public:
-    using EventHandler = ble::GattClient::EventHandler;
-    using WriteOp_t = ble::GattClient::WriteOp_t;
-    using HVXCallback_t  = ble::GattClient::HVXCallback_t ;
-    using GattClientShutdownCallback_t  = ble::GattClient::GattClientShutdownCallback_t ;
-    using GattClientShutdownCallbackChain_t  = ble::GattClient::GattClientShutdownCallbackChain_t ;
-    using HVXCallbackChain_t  = ble::GattClient::HVXCallbackChain_t ;
-    using ReadCallbackChain_t  = ble::GattClient::ReadCallbackChain_t ;
-    using WriteCallbackChain_t  = ble::GattClient::WriteCallbackChain_t ;
-
-    GattClient() {};
-    GattClient(const GattClient&) = delete;
-    GattClient& operator=(const GattClient&) = delete;
-    virtual ~GattClient() {};
-
-    virtual void setEventHandler(EventHandler *handler) { };
-
-    virtual ble_error_t launchServiceDiscovery(
-            ble::connection_handle_t connectionHandle,
-            ServiceDiscovery::ServiceCallback_t sc = nullptr,
-            ServiceDiscovery::CharacteristicCallback_t cc = nullptr,
-            const UUID &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
-            const UUID &matchingCharacteristicUUIDIn = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t discoverServices(
-            ble::connection_handle_t connectionHandle,
-            ServiceDiscovery::ServiceCallback_t callback,
-            const UUID &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t discoverServices(
-            ble::connection_handle_t connectionHandle,
-            ServiceDiscovery::ServiceCallback_t callback,
-            GattAttribute::Handle_t startHandle,
-            GattAttribute::Handle_t endHandle
-    ) { return BLE_ERROR_NONE; };
-
-    virtual bool isServiceDiscoveryActive(void) const { return true; };
-
-    virtual void terminateServiceDiscovery(void) { };
-
-    virtual ble_error_t read(
-            ble::connection_handle_t connHandle,
-            GattAttribute::Handle_t attributeHandle,
-            uint16_t offset
-    ) const { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t write(
-            GattClient::WriteOp_t cmd,
-            ble::connection_handle_t connHandle,
-            GattAttribute::Handle_t attributeHandle,
-            size_t length,
-            const uint8_t *value
-    ) const { return BLE_ERROR_NONE; };
-
-    /* Event callback handlers. */
-
-    virtual void onDataRead(ReadCallback_t callback) { };
-
-    virtual ReadCallbackChain_t &onDataRead() { static ReadCallbackChain_t chain; return chain; };
-
-    virtual void onDataWritten(WriteCallback_t callback) { };
-
-    virtual WriteCallbackChain_t &onDataWritten() { static WriteCallbackChain_t chain; return chain; };
-
-    virtual void onServiceDiscoveryTermination(
-            ServiceDiscovery::TerminationCallback_t callback
-    ) { };
-
-    virtual ble_error_t discoverCharacteristicDescriptors(
-            const DiscoveredCharacteristic &characteristic,
-            const CharacteristicDescriptorDiscovery::DiscoveryCallback_t &discoveryCallback,
-            const CharacteristicDescriptorDiscovery::TerminationCallback_t &terminationCallback
-    ) { return BLE_ERROR_NONE; };
-
-    virtual bool isCharacteristicDescriptorDiscoveryActive(
-            const DiscoveredCharacteristic &characteristic
-    ) const { return true; };
-
-    virtual void terminateCharacteristicDescriptorDiscovery(
-            const DiscoveredCharacteristic &characteristic
-    ) { };
-
-    virtual ble_error_t negotiateAttMtu(ble::connection_handle_t connection) { return BLE_ERROR_NONE; };
-
-    virtual void onHVX(HVXCallback_t callback) { };
-
-    virtual void onShutdown(const GattClientShutdownCallback_t &callback) { };
-
-    virtual GattClientShutdownCallbackChain_t &onShutdown() { static GattClientShutdownCallbackChain_t chain; return chain; };
-
-    virtual HVXCallbackChain_t &onHVX() { static HVXCallbackChain_t chain; return chain; };
-
-    virtual ble_error_t reset(void) { return BLE_ERROR_NONE; };
-
-    virtual void processReadResponse(const GattReadCallbackParams *params) { };
-
-    virtual void processWriteResponse(const GattWriteCallbackParams *params) { };
-
-    virtual void processHVXEvent(const GattHVXCallbackParams *params) { };
-};
-
-}
-}
-
-#endif //BLE_GATTCLIENTSTUB_H
diff --git a/UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h b/UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h
deleted file mode 100644
index 8bc1234..0000000
--- a/UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2020 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SECURITYMANAGERSTUB_H
-#define SECURITYMANAGERSTUB_H
-
-namespace ble {
-namespace impl {
-
-class SecurityManager {
-public:
-    SecurityManager() {};
-    SecurityManager(const SecurityManager&) = delete;
-    SecurityManager& operator=(const SecurityManager&) = delete;
-    virtual ~SecurityManager() {};
-
-    using SecurityIOCapabilities_t = ble::SecurityManager::SecurityIOCapabilities_t;
-    using SecurityMode_t = ble::SecurityManager::SecurityMode_t;
-    using SecurityManagerShutdownCallback_t = ble::SecurityManager::SecurityManagerShutdownCallback_t;
-    using SecurityManagerShutdownCallbackChain_t = ble::SecurityManager::SecurityManagerShutdownCallbackChain_t;
-    using EventHandler = ble::SecurityManager::EventHandler;
-    using Passkey_t  = ble::SecurityManager::Passkey_t ;
-
-    static auto constexpr IO_CAPS_NONE = ble::SecurityManager::IO_CAPS_NONE;
-
-    virtual ble_error_t init(
-        bool enableBonding = true,
-        bool requireMITM = true,
-        SecurityIOCapabilities_t iocaps = IO_CAPS_NONE,
-        const Passkey_t passkey = nullptr,
-        bool signing = true,
-        const char *dbFilepath = nullptr
-    ) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setDatabaseFilepath(const char *dbFilepath = nullptr) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t reset() { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t preserveBondingStateOnReset(bool enable) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t writeBondingStateToPersistentStorage() { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // List management
-    //
-
-    virtual ble_error_t purgeAllBondingState() { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t generateWhitelistFromBondTable(::ble::whitelist_t *whitelist) const { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Pairing
-    //
-
-#if BLE_ROLE_CENTRAL
-    virtual ble_error_t requestPairing(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
-#endif // BLE_ROLE_CENTRAL
-
-#if BLE_ROLE_PERIPHERAL
-    virtual ble_error_t acceptPairingRequest(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
-#endif // BLE_ROLE_PERIPHERAL
-
-    virtual ble_error_t cancelPairingRequest(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setPairingRequestAuthorisation(bool required = true) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t getPeerIdentity(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Feature support
-    //
-#if BLE_FEATURE_SECURE_CONNECTIONS
-    virtual ble_error_t allowLegacyPairing(bool allow = true) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t getSecureConnectionsSupport(bool *enabled) { return BLE_ERROR_NONE; };
-#endif // BLE_FEATURE_SECURE_CONNECTIONS
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Security settings
-    //
-
-    virtual ble_error_t setIoCapability(SecurityIOCapabilities_t iocaps) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setDisplayPasskey(const Passkey_t passkey) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setLinkSecurity(ble::connection_handle_t connectionHandle, SecurityMode_t securityMode) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setKeypressNotification(bool enabled = true) { return BLE_ERROR_NONE; };
-
-#if BLE_FEATURE_SIGNING
-
-    virtual ble_error_t enableSigning(ble::connection_handle_t connectionHandle, bool enabled = true) { return BLE_ERROR_NONE; };
-
-#endif // BLE_FEATURE_SIGNING
-
-    virtual ble_error_t setHintFutureRoleReversal(bool enable = true) { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Encryption
-    //
-
-    virtual ble_error_t getLinkEncryption(ble::connection_handle_t connectionHandle, ble::link_encryption_t *encryption) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setLinkEncryption(ble::connection_handle_t connectionHandle, ble::link_encryption_t encryption) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setEncryptionKeyRequirements(uint8_t minimumByteSize, uint8_t maximumByteSize) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t getEncryptionKeySize(
-        connection_handle_t connectionHandle,
-        uint8_t *size
-    ) { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Authentication
-    //
-
-    virtual ble_error_t requestAuthentication(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
-
-    ////////////////////////////////////////////////////////////////////////////
-    // MITM
-    //
-
-    virtual ble_error_t generateOOB(const ble::address_t *address) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t setOOBDataUsage(ble::connection_handle_t connectionHandle, bool useOOB, bool OOBProvidesMITM = true) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t passkeyEntered(ble::connection_handle_t connectionHandle, Passkey_t passkey) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t legacyPairingOobReceived(const ble::address_t *address, const ble::oob_tk_t *tk) { return BLE_ERROR_NONE; };
-#if BLE_FEATURE_SECURE_CONNECTIONS
-    virtual ble_error_t confirmationEntered(ble::connection_handle_t connectionHandle, bool confirmation) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t sendKeypressNotification(ble::connection_handle_t connectionHandle, ble::Keypress_t keypress) { return BLE_ERROR_NONE; };
-
-    virtual ble_error_t oobReceived(
-        const ble::address_t *address,
-        const ble::oob_lesc_value_t *random,
-        const ble::oob_confirm_t *confirm
-    ) { return BLE_ERROR_NONE; };
-#endif // BLE_FEATURE_SECURE_CONNECTIONS
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Keys
-    //
-#if BLE_FEATURE_SIGNING
-    virtual ble_error_t getSigningKey(ble::connection_handle_t connectionHandle, bool authenticated) { return BLE_ERROR_NONE; };
-#endif // BLE_FEATURE_SIGNING
-    ////////////////////////////////////////////////////////////////////////////
-    // Privacy
-    //
-
-#if BLE_FEATURE_PRIVACY
-    virtual ble_error_t setPrivateAddressTimeout(
-        uint16_t timeout_in_seconds
-    ) { return BLE_ERROR_NONE; };
-#endif // BLE_FEATURE_PRIVACY
-
-    /* Event callback handlers. */
-public:
-
-    virtual void onShutdown(const SecurityManagerShutdownCallback_t &callback) { };
-
-    template<typename T>
-    void onShutdown(T *objPtr, void (T::*memberPtr)(const SecurityManager *)) { };
-
-    virtual SecurityManagerShutdownCallbackChain_t &onShutdown() { static SecurityManagerShutdownCallbackChain_t chain; return chain; };
-
-    virtual void setSecurityManagerEventHandler(EventHandler *handler) { };
-};
-
-}
-}
-
-#endif //SECURITYMANAGERSTUB_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
index 4aea9ff..93a943c 100644
--- a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(fakes)
+
 add_library(mbed-headers-feature-ble INTERFACE)
 
 target_include_directories(mbed-headers-feature-ble
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
new file mode 100644
index 0000000..9dbedb1
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
@@ -0,0 +1,163 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ble/BLE.h"
+#include "GattServerImpl_mock.h"
+#include "GattClientImpl_mock.h"
+#include "GapImpl_mock.h"
+#include "SecurityManagerImpl_mock.h"
+#include "ble/GattClient.h"
+#include "ble/GattServer.h"
+#include "ble/SecurityManager.h"
+#include "ble/Gap.h"
+#include "ble_mocks.h"
+
+namespace ble {
+
+static GapMock *gap_impl = nullptr;
+static GattServerMock *gatt_server_impl = nullptr;
+static GattClientMock *gatt_client_impl = nullptr;
+static SecurityManagerMock *security_manager_impl = nullptr;
+
+static Gap *gap = nullptr;
+static GattServer *gatt_server = nullptr;
+static GattClient *gatt_client = nullptr;
+static SecurityManager *security_manager = nullptr;
+
+GapMock& gap_mock() {
+    return *ble::gap_impl;
+}
+
+GattServerMock& gatt_server_mock() {
+    return *ble::gatt_server_impl;
+}
+
+GattClientMock& gatt_client_mock() {
+    return *ble::gatt_client_impl;
+}
+
+SecurityManagerMock& security_manager_mock() {
+    return *ble::security_manager_impl;
+}
+
+void init_mocks() {
+    if (gap_impl) {
+        /* we are already initialised */
+        return;
+    }
+
+    /* mocks */
+    gap_impl = new GapMock();
+    gatt_server_impl = new GattServerMock();
+    gatt_client_impl = new GattClientMock();
+    security_manager_impl = new SecurityManagerMock();
+    /* user APIS */
+    gap = new Gap(gap_impl);
+    gatt_server = new GattServer(gatt_server_impl);
+    gatt_client = new GattClient(gatt_client_impl);
+    security_manager = new SecurityManager(security_manager_impl);
+}
+
+void delete_mocks() {
+    delete gap;
+    delete gap_impl;
+    delete gatt_server;
+    delete gatt_server_impl;
+    delete gatt_client;
+    delete gatt_client_impl;
+    delete security_manager;
+    delete security_manager_impl;
+
+    gap = nullptr;
+    gap_impl = nullptr;
+    gatt_server = nullptr;
+    gatt_server_impl = nullptr;
+    gatt_client = nullptr;
+    gatt_client_impl = nullptr;
+    security_manager = nullptr;
+    security_manager_impl = nullptr;
+}
+
+class BLEInstanceBase {
+};
+
+BLE::BLE(ble::BLEInstanceBase &transport) : transport(transport)
+{
+}
+
+BLE& BLE::Instance()
+{
+    static ble::BLEInstanceBase transport;
+    static BLE instance(transport);
+    init_mocks();
+    return instance;
+}
+
+ble::Gap &BLE::gap()
+{
+    init_mocks();
+    return *ble::gap;
+}
+
+ble::GattServer &BLE::gattServer()
+{
+    init_mocks();
+    return *ble::gatt_server;
+}
+
+ble::GattClient &BLE::gattClient()
+{
+    init_mocks();
+    return *ble::gatt_client;
+}
+
+ble::SecurityManager &BLE::securityManager()
+{
+    init_mocks();
+    return *ble::security_manager;
+}
+
+const ble::Gap &BLE::gap() const
+{
+    auto &self = const_cast<BLE &>(*this);
+    return const_cast<const ble::Gap &>(self.gap());
+}
+
+const ble::GattServer &BLE::gattServer() const
+{
+    auto &self = const_cast<BLE &>(*this);
+    return const_cast<const ble::GattServer &>(self.gattServer());
+}
+
+const ble::GattClient &BLE::gattClient() const
+{
+    auto &self = const_cast<BLE &>(*this);
+    return const_cast<const ble::GattClient &>(self.gattClient());
+}
+
+const ble::SecurityManager &BLE::securityManager() const
+{
+    auto &self = const_cast<BLE &>(*this);
+    return const_cast<const ble::SecurityManager &>(self.securityManager());
+}
+
+void BLE::processEvents()
+{
+
+}
+
+}
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt
new file mode 100644
index 0000000..6ba8064
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-fakes-ble)
+
+target_include_directories(mbed-fakes-ble
+    PUBLIC
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source
+    PRIVATE
+        ${gtest_SOURCE_DIR}/include
+        ${gmock_SOURCE_DIR}/include
+)
+
+target_sources(mbed-fakes-ble
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/AdvertisingParameters.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gap/ConnectionParameters.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/gatt/DiscoveredCharacteristic.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/Gap.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattClient.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattServer.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/SecurityManager.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
+)
+
+target_link_libraries(mbed-fakes-ble
+    PRIVATE
+        mbed-headers
+        mbed-stubs-headers
+        gcov
+)
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
new file mode 100644
index 0000000..6ef5aba
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
@@ -0,0 +1,91 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GAPMOCK_H
+#define BLE_GAPMOCK_H
+
+#include "gmock/gmock.h"
+#include "source/generic/GapImpl.h"
+
+namespace ble {
+
+class GapMock : public ble::impl::Gap {
+public:
+    GapMock() {};
+    GapMock(const GapMock&) = delete;
+    GapMock& operator=(const GapMock&) = delete;
+    virtual ~GapMock() {};
+
+    MOCK_METHOD((ble_error_t), reset, (), (override));
+    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
+    MOCK_METHOD(bool, isFeatureSupported, (controller_supported_features_t feature), (override));
+    MOCK_METHOD(uint8_t, getMaxAdvertisingSetNumber, (), (override));
+    MOCK_METHOD(uint16_t, getMaxAdvertisingDataLength, (), (override));
+    MOCK_METHOD(uint16_t, getMaxConnectableAdvertisingDataLength, (), (override));
+    MOCK_METHOD(uint16_t, getMaxActiveSetAdvertisingDataLength, (), (override));
+    MOCK_METHOD(ble_error_t, createAdvertisingSet, (advertising_handle_t *handle, const AdvertisingParameters &parameters), (override));
+    MOCK_METHOD(ble_error_t, destroyAdvertisingSet, (advertising_handle_t handle), (override));
+    MOCK_METHOD(ble_error_t, setAdvertisingParameters, (advertising_handle_t handle, const AdvertisingParameters &params), (override));
+    MOCK_METHOD(ble_error_t, setAdvertisingPayload, (advertising_handle_t handle, mbed::Span<const uint8_t> payload), (override));
+    MOCK_METHOD(ble_error_t, setAdvertisingScanResponse, (advertising_handle_t handle, mbed::Span<const uint8_t> response), (override));
+    MOCK_METHOD(ble_error_t, startAdvertising, (advertising_handle_t handle, adv_duration_t maxDuration, uint8_t maxEvents), (override));
+    MOCK_METHOD(ble_error_t, stopAdvertising, (advertising_handle_t handle), (override));
+    MOCK_METHOD(bool, isAdvertisingActive, (advertising_handle_t handle), (override));
+    MOCK_METHOD(ble_error_t, setPeriodicAdvertisingParameters, (advertising_handle_t handle, periodic_interval_t periodicAdvertisingIntervalMin, periodic_interval_t periodicAdvertisingIntervalMax, bool advertiseTxPower), (override));
+    MOCK_METHOD(ble_error_t, setPeriodicAdvertisingPayload, (advertising_handle_t handle, mbed::Span<const uint8_t> payload), (override));
+    MOCK_METHOD(ble_error_t, startPeriodicAdvertising, (advertising_handle_t handle), (override));
+    MOCK_METHOD(ble_error_t, stopPeriodicAdvertising, (advertising_handle_t handle), (override));
+    MOCK_METHOD(bool, isPeriodicAdvertisingActive, (advertising_handle_t handle), (override));
+    MOCK_METHOD(ble_error_t, setScanParameters, (const ScanParameters &params), (override));
+    MOCK_METHOD(ble_error_t, startScan, (scan_duration_t duration, duplicates_filter_t filtering, scan_period_t period), (override));
+    MOCK_METHOD(ble_error_t, initiate_scan, (), (override));
+    MOCK_METHOD(ble_error_t, stopScan, (), (override));
+    MOCK_METHOD(ble_error_t, createSync, (peer_address_type_t peerAddressType, const address_t &peerAddress, uint8_t sid, slave_latency_t maxPacketSkip, sync_timeout_t timeout), (override));
+    MOCK_METHOD(ble_error_t, createSync, (slave_latency_t maxPacketSkip, sync_timeout_t timeout), (override));
+    MOCK_METHOD(ble_error_t, cancelCreateSync, (), (override));
+    MOCK_METHOD(ble_error_t, terminateSync, (periodic_sync_handle_t handle), (override));
+    MOCK_METHOD(ble_error_t, addDeviceToPeriodicAdvertiserList, (peer_address_type_t peerAddressType, const address_t &peerAddress, advertising_sid_t sid), (override));
+    MOCK_METHOD(ble_error_t, removeDeviceFromPeriodicAdvertiserList, (peer_address_type_t peerAddressType, const address_t &peerAddress, advertising_sid_t sid), (override));
+    MOCK_METHOD(ble_error_t, clearPeriodicAdvertiserList, (), (override));
+    MOCK_METHOD(ble_error_t, connect, (peer_address_type_t peerAddressType, const address_t &peerAddress, const ConnectionParameters &connectionParams), (override));
+    MOCK_METHOD(ble_error_t, cancelConnect, (), (override));
+    MOCK_METHOD(ble_error_t, updateConnectionParameters, (connection_handle_t connectionHandle, conn_interval_t minConnectionInterval, conn_interval_t maxConnectionInterval, slave_latency_t slaveLatency, supervision_timeout_t supervision_timeout, conn_event_length_t minConnectionEventLength, conn_event_length_t maxConnectionEventLength), (override));
+    MOCK_METHOD(ble_error_t, manageConnectionParametersUpdateRequest, (bool userManageConnectionUpdateRequest), (override));
+    MOCK_METHOD(ble_error_t, acceptConnectionParametersUpdate, (connection_handle_t connectionHandle, conn_interval_t minConnectionInterval, conn_interval_t maxConnectionInterval, slave_latency_t slaveLatency, supervision_timeout_t supervision_timeout, conn_event_length_t minConnectionEventLength, conn_event_length_t maxConnectionEventLength), (override));
+    MOCK_METHOD(ble_error_t, rejectConnectionParametersUpdate, (connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, disconnect, (connection_handle_t connectionHandle, local_disconnection_reason_t reason), (override));
+    MOCK_METHOD(ble_error_t, readPhy, (connection_handle_t connection), (override));
+    MOCK_METHOD(ble_error_t, setPreferredPhys, (const phy_set_t *txPhys, const phy_set_t *rxPhys), (override));
+    MOCK_METHOD(ble_error_t, setPhy, (connection_handle_t connection, const phy_set_t *txPhys, const phy_set_t *rxPhys, coded_symbol_per_bit_t codedSymbol), (override));
+    MOCK_METHOD(ble_error_t, enablePrivacy, (bool enable), (override));
+    MOCK_METHOD(ble_error_t, setPeripheralPrivacyConfiguration, (const peripheral_privacy_configuration_t *configuration), (override));
+    MOCK_METHOD(ble_error_t, getPeripheralPrivacyConfiguration, (peripheral_privacy_configuration_t *configuration), (override));
+    MOCK_METHOD(ble_error_t, setCentralPrivacyConfiguration, (const central_privacy_configuration_t *configuration), (override));
+    MOCK_METHOD(ble_error_t, getCentralPrivacyConfiguration, (central_privacy_configuration_t *configuration), (override));
+    MOCK_METHOD(uint8_t, getMaxWhitelistSize, (), (const, override));
+    MOCK_METHOD(ble_error_t, getWhitelist, (whitelist_t &whitelist), (const, override));
+    MOCK_METHOD(ble_error_t, setWhitelist, (const whitelist_t &whitelist), (override));
+    MOCK_METHOD(ble_error_t, getAddress, (own_address_type_t &typeP, address_t &address), (override));
+    MOCK_METHOD(void, onShutdown, (const GapShutdownCallback_t &callback), (override));
+    MOCK_METHOD(GapShutdownCallbackChain_t&, onShutdown, (), (override));
+    MOCK_METHOD(ble_error_t, setRandomStaticAddress, (const ble::address_t &address), (override));
+    MOCK_METHOD(ble::address_t, getRandomStaticAddress, (), (override));
+};
+
+}
+
+#endif //BLE_GAPMOCK_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
new file mode 100644
index 0000000..d0221a5
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
@@ -0,0 +1,62 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GATTCLIENTMOCK_H
+#define BLE_GATTCLIENTMOCK_H
+
+#include "gmock/gmock.h"
+#include "source/generic/GattClientImpl.h"
+
+namespace ble {
+
+class GattClientMock : public ble::impl::GattClient {
+public:
+    GattClientMock() {};
+    GattClientMock(const GattClientMock&) = delete;
+    GattClientMock& operator=(const GattClientMock&) = delete;
+    virtual ~GattClientMock() {};
+
+    MOCK_METHOD(ble_error_t, reset, (), (override));
+    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
+    MOCK_METHOD(ble_error_t, launchServiceDiscovery, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t sc, ServiceDiscovery::CharacteristicCallback_t cc, const UUID &matchingServiceUUID, const UUID &matchingCharacteristicUUIDIn), (override));
+    MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, const UUID &matchingServiceUUID), (override));
+    MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, GattAttribute::Handle_t startHandle, GattAttribute::Handle_t endHandle), (override));
+    MOCK_METHOD(bool, isServiceDiscoveryActive, (), (const, override));
+    MOCK_METHOD(void, terminateServiceDiscovery, (), (override));
+    MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, uint16_t offset), (const, override));
+    MOCK_METHOD(ble_error_t, write, (GattClient::WriteOp_t cmd, ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, size_t length, const uint8_t *value), (const, override));
+    MOCK_METHOD(void, onDataRead, (ReadCallback_t callback), (override));
+    MOCK_METHOD(ReadCallbackChain_t&, onDataRead, (), (override));
+    MOCK_METHOD(void, onDataWritten, (WriteCallback_t callback), (override));
+    MOCK_METHOD(WriteCallbackChain_t&, onDataWritten, (), (override));
+    MOCK_METHOD(void, onServiceDiscoveryTermination, (ServiceDiscovery::TerminationCallback_t callback), (override));
+    MOCK_METHOD(ble_error_t, discoverCharacteristicDescriptors, (const DiscoveredCharacteristic &characteristic, const CharacteristicDescriptorDiscovery::DiscoveryCallback_t &discoveryCallback, const CharacteristicDescriptorDiscovery::TerminationCallback_t &terminationCallback), (override));
+    MOCK_METHOD(bool, isCharacteristicDescriptorDiscoveryActive, (const DiscoveredCharacteristic &characteristic), (const, override));
+    MOCK_METHOD(void, terminateCharacteristicDescriptorDiscovery, (const DiscoveredCharacteristic &characteristic), (override));
+    MOCK_METHOD(ble_error_t, negotiateAttMtu, (ble::connection_handle_t connection), (override));
+    MOCK_METHOD(void, onHVX, (HVXCallback_t callback), (override));
+    MOCK_METHOD(void, onShutdown, (const GattClientShutdownCallback_t &callback), (override));
+    MOCK_METHOD(GattClientShutdownCallbackChain_t&, onShutdown, (), (override));
+    MOCK_METHOD(HVXCallbackChain_t&, onHVX, (), (override));
+    MOCK_METHOD(void, processReadResponse, (const GattReadCallbackParams *params), (override));
+    MOCK_METHOD(void, processWriteResponse, (const GattWriteCallbackParams *params), (override));
+    MOCK_METHOD(void, processHVXEvent, (const GattHVXCallbackParams *params), (override));
+};
+
+}
+
+#endif //BLE_GATTCLIENTMOCK_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
new file mode 100644
index 0000000..527a71f
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
@@ -0,0 +1,105 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GATTSERVERMOCK_H
+#define BLE_GATTSERVERMOCK_H
+
+#include "gmock/gmock.h"
+#include "source/GattServerImpl.h"
+
+namespace ble {
+
+class GattServerMock : public ble::impl::GattServer {
+public:
+    GattServerMock();
+    GattServerMock(const GattServerMock&) = delete;
+    GattServerMock& operator=(const GattServerMock&) = delete;
+    virtual ~GattServerMock();
+
+    MOCK_METHOD(ble_error_t, reset, (ble::GattServer* server), (override));
+    MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override));
+    MOCK_METHOD(ble_error_t, addService, (GattService &service), (override));
+    MOCK_METHOD(ble_error_t, read, (GattAttribute::Handle_t attributeHandle, uint8_t buffer[], uint16_t *lengthP), (override));
+    MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, uint8_t *buffer, uint16_t *lengthP), (override));
+    MOCK_METHOD(ble_error_t, write, (GattAttribute::Handle_t attributeHandle, const uint8_t *value, uint16_t size, bool localOnly), (override));
+    MOCK_METHOD(ble_error_t, write, (ble::connection_handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, const uint8_t *value, uint16_t size, bool localOnly), (override));
+    MOCK_METHOD(ble_error_t, areUpdatesEnabled, (const GattCharacteristic &characteristic, bool *enabledP), (override));
+    MOCK_METHOD(ble_error_t, areUpdatesEnabled, (ble::connection_handle_t connectionHandle, const GattCharacteristic &characteristic, bool *enabledP), (override));
+    MOCK_METHOD(ble::Gap::PreferredConnectionParams_t, getPreferredConnectionParams, (), (override));
+    MOCK_METHOD(void, setPreferredConnectionParams, (const ble::Gap::PreferredConnectionParams_t &params), (override));
+    MOCK_METHOD(bool, isOnDataReadAvailable, (), (const, override));
+    MOCK_METHOD(void, onDataSent, (const DataSentCallback_t &callback), (override));
+    MOCK_METHOD(DataSentCallbackChain_t&, onDataSent, (), (override));
+    MOCK_METHOD(void, onDataWritten, (const DataWrittenCallback_t &callback), (override));
+    MOCK_METHOD(DataWrittenCallbackChain_t&, onDataWritten, (), (override));
+    MOCK_METHOD(ble_error_t, onDataRead, (const DataReadCallback_t &callback), (override));
+    MOCK_METHOD(DataReadCallbackChain_t&, onDataRead, (), (override));
+    MOCK_METHOD(void, onShutdown, (const GattServerShutdownCallback_t &callback), (override));
+    MOCK_METHOD(GattServerShutdownCallbackChain_t&, onShutdown, (), (override));
+    MOCK_METHOD(void, onUpdatesEnabled, (EventCallback_t callback), (override));
+    MOCK_METHOD(void, onUpdatesDisabled, (EventCallback_t callback), (override));
+    MOCK_METHOD(void, onConfirmationReceived, (EventCallback_t callback), (override));
+    MOCK_METHOD(void, handleDataWrittenEvent, (const GattWriteCallbackParams *params), (override));
+    MOCK_METHOD(void, handleDataReadEvent, (const GattReadCallbackParams *params), (override));
+    MOCK_METHOD(void, handleEvent, (GattServerEvents::gattEvent_e type, ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle), (override));
+    MOCK_METHOD(void, handleDataSentEvent, (unsigned count), (override));
+
+    // Fake part
+    // Descriptor representation of a descriptor registered with ble::test::register_services
+    struct descriptor_t {
+        UUID uuid;
+        ble::attribute_handle_t handle;
+        ble::att_security_requirement_t read_security = ble::att_security_requirement_t::NONE;
+        ble::att_security_requirement_t write_security = ble::att_security_requirement_t::NONE;
+        bool is_readable;
+        bool is_writable;
+        std::vector<uint8_t> value;   // Use capacity to determine the max size.
+    };
+
+    // Characteristic representation of a characteristic registered with ble::test::register_services
+    struct characteristic_t {
+        UUID uuid;
+        ble::attribute_handle_t value_handle;
+        uint8_t properties;
+        ble::att_security_requirement_t read_security = ble::att_security_requirement_t::NONE;
+        ble::att_security_requirement_t write_security = ble::att_security_requirement_t::NONE;
+        ble::att_security_requirement_t update_security = ble::att_security_requirement_t::NONE;
+        FunctionPointerWithContext<GattReadAuthCallbackParams *>
+            read_cb;
+        FunctionPointerWithContext<GattWriteAuthCallbackParams *>
+            write_cb;
+        bool has_variable_len;
+        std::vector<uint8_t> value;   // Use capacity to determine the max size.
+        std::vector<descriptor_t> descriptors;
+    };
+
+    // Service representation of a service registered with ble::test::register_services
+    struct service_t {
+        UUID uuid;
+        ble::attribute_handle_t handle;
+        std::vector<characteristic_t> characteristics;
+    };
+
+    void fake_register_services(GattService& gattService);
+
+    std::vector<service_t> services;
+    ble::attribute_handle_t current_handle = 1;
+};
+
+}
+
+#endif //BLE_GATTSERVERMOCK_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
new file mode 100644
index 0000000..d0fd452
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
@@ -0,0 +1,74 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SECURITYMANAGERMOCK_H
+#define SECURITYMANAGERMOCK_H
+
+#include "gmock/gmock.h"
+#include "source/generic/SecurityManagerImpl.h"
+
+namespace ble {
+
+class SecurityManagerMock : public ble::impl::SecurityManager {
+public:
+    SecurityManagerMock() {};
+    SecurityManagerMock(const GattServerMock&) = delete;
+    SecurityManagerMock& operator=(const GattServerMock&) = delete;
+    virtual ~SecurityManagerMock() {};
+
+    MOCK_METHOD(ble_error_t, reset, (), (override));
+    MOCK_METHOD(ble_error_t, init, (bool enableBonding, bool requireMITM, SecurityIOCapabilities_t iocaps, const Passkey_t passkey, bool signing, const char *dbFilepath), (override));
+    MOCK_METHOD(ble_error_t, setDatabaseFilepath, (const char *dbFilepath), (override));
+    MOCK_METHOD(ble_error_t, preserveBondingStateOnReset, (bool enable), (override));
+    MOCK_METHOD(ble_error_t, writeBondingStateToPersistentStorage, (), (override));
+    MOCK_METHOD(ble_error_t, purgeAllBondingState, (), (override));
+    MOCK_METHOD(ble_error_t, generateWhitelistFromBondTable, (::ble::whitelist_t *whitelist), (const, override));
+    MOCK_METHOD(ble_error_t, requestPairing, (ble::connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, acceptPairingRequest, (ble::connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, cancelPairingRequest, (ble::connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, setPairingRequestAuthorisation, (bool required), (override));
+    MOCK_METHOD(ble_error_t, getPeerIdentity, (ble::connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, allowLegacyPairing, (bool allow), (override));
+    MOCK_METHOD(ble_error_t, getSecureConnectionsSupport, (bool *enabled), (override));
+    MOCK_METHOD(ble_error_t, setIoCapability, (SecurityIOCapabilities_t iocaps), (override));
+    MOCK_METHOD(ble_error_t, setDisplayPasskey, (const Passkey_t passkey), (override));
+    MOCK_METHOD(ble_error_t, setLinkSecurity, (ble::connection_handle_t connectionHandle, SecurityMode_t securityMode), (override));
+    MOCK_METHOD(ble_error_t, setKeypressNotification, (bool enabled), (override));
+    MOCK_METHOD(ble_error_t, enableSigning, (ble::connection_handle_t connectionHandle, bool enabled), (override));
+    MOCK_METHOD(ble_error_t, setHintFutureRoleReversal, (bool enable), (override));
+    MOCK_METHOD(ble_error_t, getLinkEncryption, (ble::connection_handle_t connectionHandle, ble::link_encryption_t *encryption), (override));
+    MOCK_METHOD(ble_error_t, setLinkEncryption, (ble::connection_handle_t connectionHandle, ble::link_encryption_t encryption), (override));
+    MOCK_METHOD(ble_error_t, setEncryptionKeyRequirements, (uint8_t minimumByteSize, uint8_t maximumByteSize), (override));
+    MOCK_METHOD(ble_error_t, getEncryptionKeySize, (connection_handle_t connectionHandle, uint8_t *size), (override));
+    MOCK_METHOD(ble_error_t, requestAuthentication, (ble::connection_handle_t connectionHandle), (override));
+    MOCK_METHOD(ble_error_t, generateOOB, (const ble::address_t *address), (override));
+    MOCK_METHOD(ble_error_t, setOOBDataUsage, (ble::connection_handle_t connectionHandle, bool useOOB, bool OOBProvidesMITM), (override));
+    MOCK_METHOD(ble_error_t, passkeyEntered, (ble::connection_handle_t connectionHandle, Passkey_t passkey), (override));
+    MOCK_METHOD(ble_error_t, legacyPairingOobReceived, (const ble::address_t *address, const ble::oob_tk_t *tk), (override));
+    MOCK_METHOD(ble_error_t, confirmationEntered, (ble::connection_handle_t connectionHandle, bool confirmation), (override));
+    MOCK_METHOD(ble_error_t, sendKeypressNotification, (ble::connection_handle_t connectionHandle, ble::Keypress_t keypress), (override));
+    MOCK_METHOD(ble_error_t, oobReceived, (const ble::address_t *address, const ble::oob_lesc_value_t *random, const ble::oob_confirm_t *confirm), (override));
+    MOCK_METHOD(ble_error_t, getSigningKey, (ble::connection_handle_t connectionHandle, bool authenticated), (override));
+    MOCK_METHOD(ble_error_t, setPrivateAddressTimeout, (uint16_t timeout_in_seconds), (override));
+    MOCK_METHOD(void, onShutdown, (const SecurityManagerShutdownCallback_t &callback), (override));
+    MOCK_METHOD(SecurityManagerShutdownCallbackChain_t&, onShutdown, (), (override));
+    MOCK_METHOD(void, setSecurityManagerEventHandler, (EventHandler *handler), (override));
+};
+
+}
+
+#endif //SECURITYMANAGERMOCK_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
new file mode 100644
index 0000000..2f927a7
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
@@ -0,0 +1,45 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_MOCKS_H
+#define BLE_MOCKS_H
+
+#include "GattServerImpl_mock.h"
+#include "GattClientImpl_mock.h"
+#include "GapImpl_mock.h"
+#include "SecurityManagerImpl_mock.h"
+
+/***
+ * You must use delete_mocks() at the end of the test. BLE::Instance(), ble::gap() etc. inits the mocks. Do not cache
+ * pointers between tests. Call BLE::Instance() at the start of the tests, otherwise call init_mocks() yourself.
+ * To access mocks use:
+ * gap_mock(), gatt_server_mock(), gatt_client_mock(), security_manager_mock().
+ * All functions are in namespace ble.
+ */
+namespace ble {
+
+void init_mocks();
+void delete_mocks();
+
+GapMock& gap_mock();
+GattServerMock& gatt_server_mock();
+GattClientMock& gatt_client_mock();
+SecurityManagerMock& security_manager_mock();
+
+}
+
+#endif // BLE_MOCKS_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h
new file mode 100644
index 0000000..6583a33
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h
@@ -0,0 +1,137 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GATTSERVERSTUB_H
+#define BLE_GATTSERVERSTUB_H
+
+#include "ble/GattServer.h"
+#include "generic/GattServerEvents.h"
+#include "ble/Gap.h"
+
+namespace ble {
+namespace impl {
+
+class GattServer {
+public:
+    GattServer() {};
+    GattServer(const GattServer&) = delete;
+    GattServer& operator=(const GattServer&) = delete;
+    virtual ~GattServer() {};
+
+    using EventHandler = ble::GattServer::EventHandler;
+    using DataSentCallback_t = ble::GattServer::DataSentCallback_t ;
+    using DataSentCallbackChain_t = ble::GattServer::DataSentCallbackChain_t ;
+    using DataWrittenCallback_t = ble::GattServer::DataWrittenCallback_t ;
+    using DataWrittenCallbackChain_t = ble::GattServer::DataWrittenCallbackChain_t ;
+    using DataReadCallback_t = ble::GattServer::DataReadCallback_t;
+    using DataReadCallbackChain_t = ble::GattServer::DataReadCallbackChain_t;
+    using GattServerShutdownCallback_t = ble::GattServer::GattServerShutdownCallback_t;
+    using GattServerShutdownCallbackChain_t = ble::GattServer::GattServerShutdownCallbackChain_t;
+    using EventCallback_t = ble::GattServer::EventCallback_t;
+
+    virtual void setEventHandler(EventHandler *handler) { };
+
+    virtual ble_error_t reset(ble::GattServer* server) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t addService(GattService &service) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t read(
+        GattAttribute::Handle_t attributeHandle,
+        uint8_t buffer[],
+        uint16_t *lengthP
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t read(
+        ble::connection_handle_t connectionHandle,
+        GattAttribute::Handle_t attributeHandle,
+        uint8_t *buffer,
+        uint16_t *lengthP
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t write(
+        GattAttribute::Handle_t attributeHandle,
+        const uint8_t *value,
+        uint16_t size,
+        bool localOnly = false
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t write(
+        ble::connection_handle_t connectionHandle,
+        GattAttribute::Handle_t attributeHandle,
+        const uint8_t *value,
+        uint16_t size,
+        bool localOnly = false
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t areUpdatesEnabled(
+        const GattCharacteristic &characteristic,
+        bool *enabledP
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t areUpdatesEnabled(
+        ble::connection_handle_t connectionHandle,
+        const GattCharacteristic &characteristic,
+        bool *enabledP
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble::Gap::PreferredConnectionParams_t getPreferredConnectionParams() {
+        ble::Gap::PreferredConnectionParams_t params = {0}; return params;
+    };
+
+    virtual void setPreferredConnectionParams(const ble::Gap::PreferredConnectionParams_t &params) { };
+
+    virtual bool isOnDataReadAvailable() const { return true; };
+
+    virtual void onDataSent(const DataSentCallback_t &callback) { };
+
+    virtual DataSentCallbackChain_t &onDataSent() { static DataSentCallbackChain_t chain; return chain; };
+
+    virtual void onDataWritten(const DataWrittenCallback_t &callback) { };
+
+    virtual DataWrittenCallbackChain_t &onDataWritten() { static DataWrittenCallbackChain_t chain; return chain; };
+
+    virtual ble_error_t onDataRead(const DataReadCallback_t &callback) { return BLE_ERROR_NONE; };
+
+    virtual DataReadCallbackChain_t &onDataRead() { static DataReadCallbackChain_t chain; return chain; };
+
+    virtual void onShutdown(const GattServerShutdownCallback_t &callback) { };
+
+    virtual GattServerShutdownCallbackChain_t &onShutdown() { static GattServerShutdownCallbackChain_t chain; return chain; };
+
+    virtual void onUpdatesEnabled(EventCallback_t callback) { };
+
+    virtual void onUpdatesDisabled(EventCallback_t callback) { };
+
+    virtual void onConfirmationReceived(EventCallback_t callback) { };
+
+    virtual void handleDataWrittenEvent(const GattWriteCallbackParams *params) { };
+
+    virtual void handleDataReadEvent(const GattReadCallbackParams *params) { };
+
+    virtual void handleEvent(
+        GattServerEvents::gattEvent_e type,
+        ble::connection_handle_t connHandle,
+        GattAttribute::Handle_t attributeHandle
+    ) { };
+
+    virtual void handleDataSentEvent(unsigned count) { };
+};
+
+}
+}
+
+#endif //BLE_GATTSERVERSTUB_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
new file mode 100644
index 0000000..de6fdf1
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
@@ -0,0 +1,96 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2021 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "GattServerImpl_mock.h"
+
+namespace ble {
+
+GattServerMock::GattServerMock()
+{
+    ON_CALL(*this, addService).WillByDefault([this](GattService &service) {
+        // Fake registration, it populates the handles of the input and store its
+        // representation in the services field.
+        fake_register_services(service);
+        return BLE_ERROR_NONE;
+    });
+}
+
+GattServerMock::~GattServerMock() {};
+
+void GattServerMock::fake_register_services(GattService& gattService)
+{
+    gattService.setHandle(current_handle++);
+    service_t result {
+        gattService.getUUID(),
+        gattService.getHandle()
+    };
+
+    for (size_t i = 0; i < gattService.getCharacteristicCount(); ++i) {
+        current_handle++; // Increment for the characteristic declaration handle
+        auto& ref = *gattService.getCharacteristic(i);
+        ref.getValueAttribute().setHandle(current_handle++);
+
+        characteristic_t c;
+        c.uuid = ref.getValueAttribute().getUUID();
+        c.value_handle = ref.getValueHandle();
+        c.properties = ref.getProperties();
+        c.read_security = ref.getReadSecurityRequirement();
+        c.write_security = ref.getWriteSecurityRequirement();
+        c.update_security = ref.getUpdateSecurityRequirement();
+        c.read_cb = ref.getReadAuthorizationCallback();
+        c.write_cb = ref.getWriteAuthorizationCallback();
+        c.value.reserve(ref.getValueAttribute().getMaxLength());
+        c.value.resize(ref.getValueAttribute().getLength());
+        {
+            auto value_ptr = ref.getValueAttribute().getValuePtr();
+            if (value_ptr) {
+                std::copy(value_ptr, value_ptr + c.value.size(), c.value.begin());
+            }
+        }
+        c.has_variable_len = ref.getValueAttribute().hasVariableLength();
+
+        for (size_t j = 0; j < ref.getDescriptorCount(); ++j) {
+            auto& ref_desc = *ref.getDescriptor(j);
+            ref_desc.setHandle(current_handle++);
+
+            descriptor_t d;
+            d.uuid = ref_desc.getUUID();
+            d.handle = ref_desc.getHandle();
+            d.read_security = ref_desc.getReadSecurityRequirement();
+            d.write_security = ref_desc.getWriteSecurityRequirement();
+            d.is_readable = ref_desc.isReadAllowed();
+            d.is_writable = ref_desc.isWriteAllowed();
+            d.value.reserve(ref_desc.getMaxLength());
+            d.value.resize(ref_desc.getLength());
+            {
+                auto value_ptr = ref_desc.getValuePtr();
+                if (value_ptr) {
+                    std::copy(value_ptr, value_ptr + d.value.size(), d.value.begin());
+                }
+            }
+
+            c.descriptors.push_back(d);
+        }
+
+        result.characteristics.push_back(c);
+    }
+
+    services.push_back(result);
+}
+
+
+}
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h
new file mode 100644
index 0000000..64704ef
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h
@@ -0,0 +1,317 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GAPSTUB_H
+#define BLE_GAPSTUB_H
+
+namespace ble {
+namespace impl {
+
+class Gap {
+public:
+    Gap() {};
+    Gap(const Gap&) = delete;
+    Gap& operator=(const Gap&) = delete;
+    virtual ~Gap() {};
+
+    using EventHandler = ::ble::Gap::EventHandler;
+    using GapShutdownCallback_t = ::ble::Gap::GapShutdownCallback_t;
+    using GapShutdownCallbackChain_t  = ::ble::Gap::GapShutdownCallbackChain_t ;
+    using PreferredConnectionParams_t = ::ble::Gap::PreferredConnectionParams_t ;
+
+#if BLE_FEATURE_PRIVACY
+#if BLE_ROLE_BROADCASTER
+    static const peripheral_privacy_configuration_t default_peripheral_privacy_configuration;
+#endif // BLE_ROLE_BROADCASTER
+
+#if BLE_ROLE_OBSERVER
+    /**
+     * Default peripheral privacy configuration.
+     */
+    static const central_privacy_configuration_t default_central_privacy_configuration;
+#endif // BLE_ROLE_OBSERVER
+#endif // BLE_FEATURE_PRIVACY
+
+public:
+    virtual void setEventHandler(EventHandler *handler) { };
+
+    virtual bool isFeatureSupported(controller_supported_features_t feature) { return true; };
+
+    /*                                     advertising                                           */
+#if BLE_ROLE_BROADCASTER
+
+    virtual uint8_t getMaxAdvertisingSetNumber() { return 1; };
+
+    virtual uint16_t getMaxAdvertisingDataLength() { return 23; };
+
+    virtual uint16_t getMaxConnectableAdvertisingDataLength() {  return 21; };
+
+    virtual uint16_t getMaxActiveSetAdvertisingDataLength() {  return 21; };
+
+#if BLE_FEATURE_EXTENDED_ADVERTISING
+
+    virtual ble_error_t createAdvertisingSet(
+        advertising_handle_t *handle,
+        const AdvertisingParameters &parameters
+    ) {  return BLE_ERROR_NONE; };
+
+    virtual ble_error_t destroyAdvertisingSet(advertising_handle_t handle) { return BLE_ERROR_NONE; };
+
+#endif // BLE_FEATURE_EXTENDED_ADVERTISING
+
+    virtual ble_error_t setAdvertisingParameters(
+        advertising_handle_t handle,
+        const AdvertisingParameters &params
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setAdvertisingPayload(
+        advertising_handle_t handle,
+        mbed::Span<const uint8_t> payload
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setAdvertisingScanResponse(
+        advertising_handle_t handle,
+        mbed::Span<const uint8_t> response
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t startAdvertising(
+        advertising_handle_t handle,
+        adv_duration_t maxDuration = adv_duration_t::forever(),
+        uint8_t maxEvents = 0
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t stopAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
+
+    virtual bool isAdvertisingActive(advertising_handle_t handle) { return true; };
+
+#endif // BLE_ROLE_BROADCASTER
+
+#if BLE_ROLE_BROADCASTER
+#if BLE_FEATURE_PERIODIC_ADVERTISING
+
+    virtual ble_error_t setPeriodicAdvertisingParameters(
+        advertising_handle_t handle,
+        periodic_interval_t periodicAdvertisingIntervalMin,
+        periodic_interval_t periodicAdvertisingIntervalMax,
+        bool advertiseTxPower = true
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setPeriodicAdvertisingPayload(
+        advertising_handle_t handle,
+        mbed::Span<const uint8_t> payload
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t startPeriodicAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t stopPeriodicAdvertising(advertising_handle_t handle) { return BLE_ERROR_NONE; };
+
+    virtual bool isPeriodicAdvertisingActive(advertising_handle_t handle) { return true; };
+
+#endif // BLE_ROLE_BROADCASTER
+#endif // BLE_FEATURE_PERIODIC_ADVERTISING
+
+    /*                                     scanning                                              */
+#if BLE_ROLE_OBSERVER
+
+    virtual ble_error_t setScanParameters(const ScanParameters &params) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t startScan(
+        scan_duration_t duration = scan_duration_t::forever(),
+        duplicates_filter_t filtering = duplicates_filter_t::DISABLE,
+        scan_period_t period = scan_period_t(0)
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t initiate_scan() { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t stopScan() { return BLE_ERROR_NONE; };
+
+#endif // BLE_ROLE_OBSERVER
+
+#if BLE_ROLE_OBSERVER
+#if BLE_FEATURE_PERIODIC_ADVERTISING
+
+    virtual ble_error_t createSync(
+        peer_address_type_t peerAddressType,
+        const address_t &peerAddress,
+        uint8_t sid,
+        slave_latency_t maxPacketSkip,
+        sync_timeout_t timeout
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t createSync(
+        slave_latency_t maxPacketSkip,
+        sync_timeout_t timeout
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t cancelCreateSync() { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t terminateSync(periodic_sync_handle_t handle) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t addDeviceToPeriodicAdvertiserList(
+        peer_address_type_t peerAddressType,
+        const address_t &peerAddress,
+        advertising_sid_t sid
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t removeDeviceFromPeriodicAdvertiserList(
+            peer_address_type_t peerAddressType,
+            const address_t &peerAddress,
+            advertising_sid_t sid
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t clearPeriodicAdvertiserList() { return BLE_ERROR_NONE; };
+
+    uint8_t getMaxPeriodicAdvertiserListSize() { return 1; };
+
+#endif // BLE_ROLE_OBSERVER
+#endif // BLE_FEATURE_PERIODIC_ADVERTISING
+
+#if BLE_ROLE_CENTRAL
+
+    virtual ble_error_t connect(
+            peer_address_type_t peerAddressType,
+            const address_t &peerAddress,
+            const ConnectionParameters &connectionParams
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t cancelConnect() { return BLE_ERROR_NONE; };
+
+#endif // BLE_ROLE_CENTRAL
+
+#if BLE_FEATURE_CONNECTABLE
+
+    virtual ble_error_t updateConnectionParameters(
+        connection_handle_t connectionHandle,
+        conn_interval_t minConnectionInterval,
+        conn_interval_t maxConnectionInterval,
+        slave_latency_t slaveLatency,
+        supervision_timeout_t supervision_timeout,
+        conn_event_length_t minConnectionEventLength = conn_event_length_t(0),
+        conn_event_length_t maxConnectionEventLength = conn_event_length_t(0)
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t manageConnectionParametersUpdateRequest(
+        bool userManageConnectionUpdateRequest
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t acceptConnectionParametersUpdate(
+        connection_handle_t connectionHandle,
+        conn_interval_t minConnectionInterval,
+        conn_interval_t maxConnectionInterval,
+        slave_latency_t slaveLatency,
+        supervision_timeout_t supervision_timeout,
+        conn_event_length_t minConnectionEventLength = conn_event_length_t(0),
+        conn_event_length_t maxConnectionEventLength = conn_event_length_t(0)
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t rejectConnectionParametersUpdate(
+        connection_handle_t connectionHandle
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t disconnect(
+        connection_handle_t connectionHandle,
+        local_disconnection_reason_t reason
+    ) { return BLE_ERROR_NONE; };
+
+#endif // BLE_FEATURE_CONNECTABLE
+#if BLE_FEATURE_PHY_MANAGEMENT
+
+    virtual ble_error_t readPhy(connection_handle_t connection) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setPreferredPhys(
+        const phy_set_t *txPhys,
+        const phy_set_t *rxPhys
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setPhy(
+        connection_handle_t connection,
+        const phy_set_t *txPhys,
+        const phy_set_t *rxPhys,
+        coded_symbol_per_bit_t codedSymbol
+    ) { return BLE_ERROR_NONE; };
+
+#endif // BLE_FEATURE_PHY_MANAGEMENT
+
+#if BLE_FEATURE_PRIVACY
+
+    virtual ble_error_t enablePrivacy(bool enable) { return BLE_ERROR_NONE; };
+
+#if BLE_ROLE_BROADCASTER
+
+    virtual ble_error_t setPeripheralPrivacyConfiguration(
+        const peripheral_privacy_configuration_t *configuration
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t getPeripheralPrivacyConfiguration(
+        peripheral_privacy_configuration_t *configuration
+    ) { return BLE_ERROR_NONE; };
+
+#endif // BLE_ROLE_BROADCASTER
+
+#if BLE_ROLE_OBSERVER
+
+    virtual ble_error_t setCentralPrivacyConfiguration(
+        const central_privacy_configuration_t *configuration
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t getCentralPrivacyConfiguration(
+        central_privacy_configuration_t *configuration
+    ) { return BLE_ERROR_NONE; };
+
+#endif // BLE_ROLE_OBSERVER
+#endif // BLE_FEATURE_PRIVACY
+
+#if BLE_FEATURE_WHITELIST
+
+    virtual uint8_t getMaxWhitelistSize() const { return 1; };
+
+    virtual ble_error_t getWhitelist(whitelist_t &whitelist) const { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setWhitelist(const whitelist_t &whitelist) { return BLE_ERROR_NONE; };
+
+#endif // BLE_FEATURE_WHITELIST
+
+    virtual ble_error_t getAddress(
+        own_address_type_t &typeP,
+        address_t &address
+    ) { return BLE_ERROR_NONE; };
+
+    static ble_error_t getRandomAddressType(
+        ble::address_t address,
+        ble::random_address_type_t *addressType
+    ) { return BLE_ERROR_NONE;};
+
+    virtual ble_error_t reset() { return BLE_ERROR_NONE; };
+
+    virtual void onShutdown(const GapShutdownCallback_t &callback) { };
+
+    virtual GapShutdownCallbackChain_t &onShutdown() { static GapShutdownCallbackChain_t chain; return chain; };
+
+    /*
+     * API reserved for the controller driver to set the random static address.
+     * Setting a new random static address while the controller is operating is
+     * forbidden by the Bluetooth specification.
+     */
+    virtual ble_error_t setRandomStaticAddress(const ble::address_t &address) { return BLE_ERROR_NONE; };
+
+    virtual ble::address_t getRandomStaticAddress() { return ble::address_t(); };
+};
+
+}
+}
+
+#endif //BLE_GAPSTUB_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h
new file mode 100644
index 0000000..a0bc5e8
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h
@@ -0,0 +1,133 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BLE_GATTCLIENTSTUB_H
+#define BLE_GATTCLIENTSTUB_H
+
+#include "events/EventQueue.h"
+
+namespace ble {
+namespace impl {
+
+class GattClient {
+public:
+    using EventHandler = ble::GattClient::EventHandler;
+    using WriteOp_t = ble::GattClient::WriteOp_t;
+    using HVXCallback_t  = ble::GattClient::HVXCallback_t ;
+    using GattClientShutdownCallback_t  = ble::GattClient::GattClientShutdownCallback_t ;
+    using GattClientShutdownCallbackChain_t  = ble::GattClient::GattClientShutdownCallbackChain_t ;
+    using HVXCallbackChain_t  = ble::GattClient::HVXCallbackChain_t ;
+    using ReadCallbackChain_t  = ble::GattClient::ReadCallbackChain_t ;
+    using WriteCallbackChain_t  = ble::GattClient::WriteCallbackChain_t ;
+
+    GattClient() {};
+    GattClient(const GattClient&) = delete;
+    GattClient& operator=(const GattClient&) = delete;
+    virtual ~GattClient() {};
+
+    virtual void setEventHandler(EventHandler *handler) { };
+
+    virtual ble_error_t launchServiceDiscovery(
+            ble::connection_handle_t connectionHandle,
+            ServiceDiscovery::ServiceCallback_t sc = nullptr,
+            ServiceDiscovery::CharacteristicCallback_t cc = nullptr,
+            const UUID &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
+            const UUID &matchingCharacteristicUUIDIn = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t discoverServices(
+            ble::connection_handle_t connectionHandle,
+            ServiceDiscovery::ServiceCallback_t callback,
+            const UUID &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t discoverServices(
+            ble::connection_handle_t connectionHandle,
+            ServiceDiscovery::ServiceCallback_t callback,
+            GattAttribute::Handle_t startHandle,
+            GattAttribute::Handle_t endHandle
+    ) { return BLE_ERROR_NONE; };
+
+    virtual bool isServiceDiscoveryActive(void) const { return true; };
+
+    virtual void terminateServiceDiscovery(void) { };
+
+    virtual ble_error_t read(
+            ble::connection_handle_t connHandle,
+            GattAttribute::Handle_t attributeHandle,
+            uint16_t offset
+    ) const { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t write(
+            GattClient::WriteOp_t cmd,
+            ble::connection_handle_t connHandle,
+            GattAttribute::Handle_t attributeHandle,
+            size_t length,
+            const uint8_t *value
+    ) const { return BLE_ERROR_NONE; };
+
+    /* Event callback handlers. */
+
+    virtual void onDataRead(ReadCallback_t callback) { };
+
+    virtual ReadCallbackChain_t &onDataRead() { static ReadCallbackChain_t chain; return chain; };
+
+    virtual void onDataWritten(WriteCallback_t callback) { };
+
+    virtual WriteCallbackChain_t &onDataWritten() { static WriteCallbackChain_t chain; return chain; };
+
+    virtual void onServiceDiscoveryTermination(
+            ServiceDiscovery::TerminationCallback_t callback
+    ) { };
+
+    virtual ble_error_t discoverCharacteristicDescriptors(
+            const DiscoveredCharacteristic &characteristic,
+            const CharacteristicDescriptorDiscovery::DiscoveryCallback_t &discoveryCallback,
+            const CharacteristicDescriptorDiscovery::TerminationCallback_t &terminationCallback
+    ) { return BLE_ERROR_NONE; };
+
+    virtual bool isCharacteristicDescriptorDiscoveryActive(
+            const DiscoveredCharacteristic &characteristic
+    ) const { return true; };
+
+    virtual void terminateCharacteristicDescriptorDiscovery(
+            const DiscoveredCharacteristic &characteristic
+    ) { };
+
+    virtual ble_error_t negotiateAttMtu(ble::connection_handle_t connection) { return BLE_ERROR_NONE; };
+
+    virtual void onHVX(HVXCallback_t callback) { };
+
+    virtual void onShutdown(const GattClientShutdownCallback_t &callback) { };
+
+    virtual GattClientShutdownCallbackChain_t &onShutdown() { static GattClientShutdownCallbackChain_t chain; return chain; };
+
+    virtual HVXCallbackChain_t &onHVX() { static HVXCallbackChain_t chain; return chain; };
+
+    virtual ble_error_t reset(void) { return BLE_ERROR_NONE; };
+
+    virtual void processReadResponse(const GattReadCallbackParams *params) { };
+
+    virtual void processWriteResponse(const GattWriteCallbackParams *params) { };
+
+    virtual void processHVXEvent(const GattHVXCallbackParams *params) { };
+};
+
+}
+}
+
+#endif //BLE_GATTCLIENTSTUB_H
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h
new file mode 100644
index 0000000..8bc1234
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h
@@ -0,0 +1,188 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SECURITYMANAGERSTUB_H
+#define SECURITYMANAGERSTUB_H
+
+namespace ble {
+namespace impl {
+
+class SecurityManager {
+public:
+    SecurityManager() {};
+    SecurityManager(const SecurityManager&) = delete;
+    SecurityManager& operator=(const SecurityManager&) = delete;
+    virtual ~SecurityManager() {};
+
+    using SecurityIOCapabilities_t = ble::SecurityManager::SecurityIOCapabilities_t;
+    using SecurityMode_t = ble::SecurityManager::SecurityMode_t;
+    using SecurityManagerShutdownCallback_t = ble::SecurityManager::SecurityManagerShutdownCallback_t;
+    using SecurityManagerShutdownCallbackChain_t = ble::SecurityManager::SecurityManagerShutdownCallbackChain_t;
+    using EventHandler = ble::SecurityManager::EventHandler;
+    using Passkey_t  = ble::SecurityManager::Passkey_t ;
+
+    static auto constexpr IO_CAPS_NONE = ble::SecurityManager::IO_CAPS_NONE;
+
+    virtual ble_error_t init(
+        bool enableBonding = true,
+        bool requireMITM = true,
+        SecurityIOCapabilities_t iocaps = IO_CAPS_NONE,
+        const Passkey_t passkey = nullptr,
+        bool signing = true,
+        const char *dbFilepath = nullptr
+    ) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setDatabaseFilepath(const char *dbFilepath = nullptr) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t reset() { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t preserveBondingStateOnReset(bool enable) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t writeBondingStateToPersistentStorage() { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // List management
+    //
+
+    virtual ble_error_t purgeAllBondingState() { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t generateWhitelistFromBondTable(::ble::whitelist_t *whitelist) const { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Pairing
+    //
+
+#if BLE_ROLE_CENTRAL
+    virtual ble_error_t requestPairing(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
+#endif // BLE_ROLE_CENTRAL
+
+#if BLE_ROLE_PERIPHERAL
+    virtual ble_error_t acceptPairingRequest(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
+#endif // BLE_ROLE_PERIPHERAL
+
+    virtual ble_error_t cancelPairingRequest(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setPairingRequestAuthorisation(bool required = true) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t getPeerIdentity(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Feature support
+    //
+#if BLE_FEATURE_SECURE_CONNECTIONS
+    virtual ble_error_t allowLegacyPairing(bool allow = true) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t getSecureConnectionsSupport(bool *enabled) { return BLE_ERROR_NONE; };
+#endif // BLE_FEATURE_SECURE_CONNECTIONS
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Security settings
+    //
+
+    virtual ble_error_t setIoCapability(SecurityIOCapabilities_t iocaps) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setDisplayPasskey(const Passkey_t passkey) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setLinkSecurity(ble::connection_handle_t connectionHandle, SecurityMode_t securityMode) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setKeypressNotification(bool enabled = true) { return BLE_ERROR_NONE; };
+
+#if BLE_FEATURE_SIGNING
+
+    virtual ble_error_t enableSigning(ble::connection_handle_t connectionHandle, bool enabled = true) { return BLE_ERROR_NONE; };
+
+#endif // BLE_FEATURE_SIGNING
+
+    virtual ble_error_t setHintFutureRoleReversal(bool enable = true) { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Encryption
+    //
+
+    virtual ble_error_t getLinkEncryption(ble::connection_handle_t connectionHandle, ble::link_encryption_t *encryption) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setLinkEncryption(ble::connection_handle_t connectionHandle, ble::link_encryption_t encryption) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setEncryptionKeyRequirements(uint8_t minimumByteSize, uint8_t maximumByteSize) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t getEncryptionKeySize(
+        connection_handle_t connectionHandle,
+        uint8_t *size
+    ) { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Authentication
+    //
+
+    virtual ble_error_t requestAuthentication(ble::connection_handle_t connectionHandle) { return BLE_ERROR_NONE; };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // MITM
+    //
+
+    virtual ble_error_t generateOOB(const ble::address_t *address) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t setOOBDataUsage(ble::connection_handle_t connectionHandle, bool useOOB, bool OOBProvidesMITM = true) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t passkeyEntered(ble::connection_handle_t connectionHandle, Passkey_t passkey) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t legacyPairingOobReceived(const ble::address_t *address, const ble::oob_tk_t *tk) { return BLE_ERROR_NONE; };
+#if BLE_FEATURE_SECURE_CONNECTIONS
+    virtual ble_error_t confirmationEntered(ble::connection_handle_t connectionHandle, bool confirmation) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t sendKeypressNotification(ble::connection_handle_t connectionHandle, ble::Keypress_t keypress) { return BLE_ERROR_NONE; };
+
+    virtual ble_error_t oobReceived(
+        const ble::address_t *address,
+        const ble::oob_lesc_value_t *random,
+        const ble::oob_confirm_t *confirm
+    ) { return BLE_ERROR_NONE; };
+#endif // BLE_FEATURE_SECURE_CONNECTIONS
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Keys
+    //
+#if BLE_FEATURE_SIGNING
+    virtual ble_error_t getSigningKey(ble::connection_handle_t connectionHandle, bool authenticated) { return BLE_ERROR_NONE; };
+#endif // BLE_FEATURE_SIGNING
+    ////////////////////////////////////////////////////////////////////////////
+    // Privacy
+    //
+
+#if BLE_FEATURE_PRIVACY
+    virtual ble_error_t setPrivateAddressTimeout(
+        uint16_t timeout_in_seconds
+    ) { return BLE_ERROR_NONE; };
+#endif // BLE_FEATURE_PRIVACY
+
+    /* Event callback handlers. */
+public:
+
+    virtual void onShutdown(const SecurityManagerShutdownCallback_t &callback) { };
+
+    template<typename T>
+    void onShutdown(T *objPtr, void (T::*memberPtr)(const SecurityManager *)) { };
+
+    virtual SecurityManagerShutdownCallbackChain_t &onShutdown() { static SecurityManagerShutdownCallbackChain_t chain; return chain; };
+
+    virtual void setSecurityManagerEventHandler(EventHandler *handler) { };
+};
+
+}
+}
+
+#endif //SECURITYMANAGERSTUB_H