Remove deprecated classes and functions

Mostly old messaging API

Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

21 files changed, 101 insertions, 638 deletions

diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
index 94f02bc1e..691139075 100644
--- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
+++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
@@ -43,15 +43,6 @@ public:
         : Qt3DInput::QAbstractAxisInput(*new Qt3DInput::QAbstractAxisInputPrivate, parent)
     {
     }
-
-private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override
-    {
-        auto creationChange = Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAbstractAxisInputData>::create(this);
-        auto &data = creationChange->data;
-        data.sourceDeviceId = qIdForNode(sourceDevice());
-        return creationChange;
-    }
 };
 
 class DummyAxisInputBackend : public Qt3DInput::Input::AbstractAxisInput
diff --git a/tests/auto/input/action/tst_action.cpp b/tests/auto/input/action/tst_action.cpp
index cc40cef2f..b4a1b5331 100644
--- a/tests/auto/input/action/tst_action.cpp
+++ b/tests/auto/input/action/tst_action.cpp
@@ -30,13 +30,11 @@
 #include <qbackendnodetester.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DInput/private/action_p.h>
 #include <Qt3DInput/QActionInput>
 #include <Qt3DInput/QAction>
 #include <Qt3DCore/private/qbackendnode_p.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class DummyActionInput : public Qt3DInput::QActionInput
 {
@@ -140,17 +138,14 @@ private Q_SLOTS:
     void shouldNotActivateWhenDisabled()
     {
         // GIVEN
-        TestArbiter arbiter;
         Qt3DInput::Input::Action backendAction;
         backendAction.setEnabled(false);
-        Qt3DCore::QBackendNodePrivate::get(&backendAction)->setArbiter(&arbiter);
 
         // WHEN
         backendAction.setActionTriggered(true);
 
         // THEN
         QVERIFY(!backendAction.actionTriggered());
-        QCOMPARE(arbiter.events.count(), 0);
     }
 };
 
diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp
index ddd59b395..2f4cab10f 100644
--- a/tests/auto/input/axis/tst_axis.cpp
+++ b/tests/auto/input/axis/tst_axis.cpp
@@ -30,14 +30,12 @@
 #include <qbackendnodetester.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DInput/private/axis_p.h>
 #include <Qt3DInput/private/qabstractaxisinput_p.h>
 #include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/QAxis>
 #include <Qt3DCore/private/qbackendnode_p.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class DummyAxisInput : public Qt3DInput::QAbstractAxisInput
 {
@@ -141,9 +139,7 @@ private Q_SLOTS:
     void shouldNotChangeValueWhenDisabled()
     {
         // GIVEN
-        TestArbiter arbiter;
         Qt3DInput::Input::Axis backendAxis;
-        Qt3DCore::QBackendNodePrivate::get(&backendAxis)->setArbiter(&arbiter);
         backendAxis.setEnabled(false);
 
         // WHEN
@@ -151,7 +147,6 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(backendAxis.axisValue(), 0.0f);
-        QCOMPARE(arbiter.events.count(), 0);
     }
 };
 
diff --git a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
index f8d4adcd2..dda68c56b 100644
--- a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
+++ b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
@@ -38,7 +38,7 @@
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAxisAccumulator>
 #include <Qt3DCore/private/qbackendnode_p.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_AxisAccumulator: public Qt3DCore::QBackendNodeTester
 {
@@ -147,7 +147,6 @@ private Q_SLOTS:
         // GIVEN
         TestArbiter arbiter;
         Qt3DInput::Input::AxisAccumulator backendAxisAccumulator;
-        Qt3DCore::QBackendNodePrivate::get(&backendAxisAccumulator)->setArbiter(&arbiter);
         backendAxisAccumulator.setEnabled(false);
 
         // WHEN
@@ -155,7 +154,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(backendAxisAccumulator.value(), 0.0f);
-        QCOMPARE(arbiter.events.count(), 0);
+        QCOMPARE(arbiter.dirtyNodes().count(), 0);
     }
 
     void checkIntegration_data()
diff --git a/tests/auto/input/axisaccumulatorjob/tst_axisaccumulatorjob.cpp b/tests/auto/input/axisaccumulatorjob/tst_axisaccumulatorjob.cpp
index 91085357a..9a016b8fe 100644
--- a/tests/auto/input/axisaccumulatorjob/tst_axisaccumulatorjob.cpp
+++ b/tests/auto/input/axisaccumulatorjob/tst_axisaccumulatorjob.cpp
@@ -39,7 +39,7 @@
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAxisAccumulator>
 #include <Qt3DCore/private/qbackendnode_p.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_AxisAccumulatorJob : public Qt3DCore::QBackendNodeTester
 {
diff --git a/tests/auto/input/commons/testdevice.h b/tests/auto/input/commons/testdevice.h
index 936a0d1b2..61f39e4bf 100644
--- a/tests/auto/input/commons/testdevice.h
+++ b/tests/auto/input/commons/testdevice.h
@@ -60,7 +60,7 @@ public:
     explicit TestDeviceBackendNode(TestDevice *device)
         : Qt3DInput::QAbstractPhysicalDeviceBackendNode(ReadOnly)
     {
-        Qt3DCore::QBackendNodeTester().simulateInitialization(device, this);
+        Qt3DCore::QBackendNodeTester().simulateInitializationSync(device, this);
     }
 
     float axisValue(int axisIdentifier) const final
diff --git a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
index c5322eda6..de4875e0e 100644
--- a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
+++ b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
@@ -36,7 +36,7 @@
 #include <Qt3DCore/private/qbackendnode_p.h>
 #include "qbackendnodetester.h"
 #include "testdeviceproxy.h"
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class FakeInputDeviceIntegration : public Qt3DInput::QInputDeviceIntegration
 {
@@ -118,7 +118,6 @@ private Q_SLOTS:
                 backendProxy->setManager(manager);
                 Qt3DCore::QBackendNodeTester backendNodeCreator;
                 backendNodeCreator.simulateInitializationSync(&proxy, backendProxy);
-                Qt3DCore::QBackendNodePrivate::get(backendProxy)->setArbiter(&arbiter);
             }
 
             // THEN
@@ -152,7 +151,6 @@ private Q_SLOTS:
                 backendProxy->setManager(manager);
                 Qt3DCore::QBackendNodeTester backendNodeCreator;
                 backendNodeCreator.simulateInitializationSync(&proxy, backendProxy);
-                Qt3DCore::QBackendNodePrivate::get(backendProxy)->setArbiter(&arbiter);
             }
 
             // THEN
@@ -171,7 +169,7 @@ private Q_SLOTS:
             job.run();
 
             // THEN -> PhysicalDeviceWrapper::setDevice should not have been called
-            QCOMPARE(arbiter.events.count(), 0);
+            QCOMPARE(arbiter.dirtyNodes().count(), 0);
         }
     }
 
diff --git a/tests/auto/input/physicaldeviceproxy/tst_physicaldeviceproxy.cpp b/tests/auto/input/physicaldeviceproxy/tst_physicaldeviceproxy.cpp
index bd5da8e3f..a6059f1f0 100644
--- a/tests/auto/input/physicaldeviceproxy/tst_physicaldeviceproxy.cpp
+++ b/tests/auto/input/physicaldeviceproxy/tst_physicaldeviceproxy.cpp
@@ -35,7 +35,7 @@
 #include <Qt3DCore/private/qbackendnode_p.h>
 #include "qbackendnodetester.h"
 #include "testdeviceproxy.h"
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 
 class tst_PhysicalDeviceProxy : public Qt3DCore::QBackendNodeTester
diff --git a/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp b/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp
index 4e9f609c4..5b59a8de0 100644
--- a/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp
+++ b/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp
@@ -34,8 +34,8 @@
 #include <Qt3DInput/QAbstractPhysicalDevice>
 #include <Qt3DInput/private/qabstractaxisinput_p.h>
 
-#include "testpostmanarbiter.h"
 #include "testdevice.h"
+#include <testarbiter.h>
 
 class DummyAxisInput : public Qt3DInput::QAbstractAxisInput
 {
@@ -68,15 +68,15 @@ private Q_SLOTS:
         // WHEN
         TestDevice *device = new TestDevice(axisInput.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
+        arbiter.clear();
 
         axisInput->setSourceDevice(device);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkSourceDeviceBookkeeping()
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
index 247a881ad..0add25778 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
@@ -36,7 +36,6 @@
 #include <Qt3DInput/private/qinputaspect_p.h>
 #include <Qt3DInput/private/inputmanagers_p.h>
 #include <Qt3DInput/private/axissetting_p.h>
-#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include "testdevice.h"
 
 class TestPhysicalDeviceBackendNode : public Qt3DInput::QAbstractPhysicalDeviceBackendNode
diff --git a/tests/auto/input/qabstractphysicaldeviceproxy/tst_qabstractphysicaldeviceproxy.cpp b/tests/auto/input/qabstractphysicaldeviceproxy/tst_qabstractphysicaldeviceproxy.cpp
index bbe184e0e..f17fba297 100644
--- a/tests/auto/input/qabstractphysicaldeviceproxy/tst_qabstractphysicaldeviceproxy.cpp
+++ b/tests/auto/input/qabstractphysicaldeviceproxy/tst_qabstractphysicaldeviceproxy.cpp
@@ -29,8 +29,6 @@
 
 #include <QtTest/QTest>
 
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 #include "testdeviceproxy.h"
 
 class tst_QAbstractPhysicalDeviceProxy : public QObject
@@ -72,58 +70,6 @@ private Q_SLOTS:
         // THEN -> should not crash
         QVERIFY(abstractPhysicalDeviceProxy->device() == nullptr);
     }
-
-    void checkCreationData()
-    {
-        // GIVEN
-        TestProxy abstractPhysicalDeviceProxy;
-
-
-        // WHEN
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&abstractPhysicalDeviceProxy);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAbstractPhysicalDeviceProxyData>>(creationChanges.first());
-            const Qt3DInput::QAbstractPhysicalDeviceProxyData cloneData = creationChangeData->data;
-
-            QCOMPARE(abstractPhysicalDeviceProxy.deviceName(), cloneData.deviceName);
-            QCOMPARE(abstractPhysicalDeviceProxy.id(), creationChangeData->subjectId());
-            QCOMPARE(abstractPhysicalDeviceProxy.isEnabled(), true);
-            QCOMPARE(abstractPhysicalDeviceProxy.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(abstractPhysicalDeviceProxy.metaObject(), creationChangeData->metaObject());
-        }
-
-        // WHEN
-        abstractPhysicalDeviceProxy.setEnabled(false);
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&abstractPhysicalDeviceProxy);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAbstractPhysicalDeviceProxyData>>(creationChanges.first());
-            const Qt3DInput::QAbstractPhysicalDeviceProxyData cloneData = creationChangeData->data;
-
-            QCOMPARE(abstractPhysicalDeviceProxy.deviceName(), cloneData.deviceName);
-            QCOMPARE(abstractPhysicalDeviceProxy.id(), creationChangeData->subjectId());
-            QCOMPARE(abstractPhysicalDeviceProxy.isEnabled(), false);
-            QCOMPARE(abstractPhysicalDeviceProxy.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(abstractPhysicalDeviceProxy.metaObject(), creationChangeData->metaObject());
-        }
-    }
-
 };
 
 QTEST_MAIN(tst_QAbstractPhysicalDeviceProxy)
diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp
index 13c4a2d83..dc8f5cbc7 100644
--- a/tests/auto/input/qaction/tst_qaction.cpp
+++ b/tests/auto/input/qaction/tst_qaction.cpp
@@ -29,14 +29,12 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QActionInput>
 #include <Qt3DInput/private/qaction_p.h>
 #include <Qt3DInput/private/qactioninput_p.h>
-
-#include "testpostmanarbiter.h"
+#include <testarbiter.h>
 
 // We need to call QNode::clone which is protected
 // We need to call QAction::sceneChangeEvent which is protected
@@ -51,53 +49,7 @@ public:
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QAction *>("action");
-
-        Qt3DInput::QAction *defaultConstructed = new Qt3DInput::QAction();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QAction *namedaction = new Qt3DInput::QAction();
-        QTest::newRow("namedAction") << namedaction;
-
-        Qt3DInput::QAction *namedactionWithInputs = new Qt3DInput::QAction();
-        Qt3DInput::QActionInput *actionInput1 = new Qt3DInput::QActionInput();
-        Qt3DInput::QActionInput *actionInput2 = new Qt3DInput::QActionInput();
-        Qt3DInput::QActionInput *actionInput3 = new Qt3DInput::QActionInput();
-        namedactionWithInputs->addInput(actionInput1);
-        namedactionWithInputs->addInput(actionInput2);
-        namedactionWithInputs->addInput(actionInput3);
-        QTest::newRow("namedActionWithInputs") << namedactionWithInputs;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QAction *, action);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(action);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + action->inputs().size());
 
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QActionData> creationChangeData =
-               qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QActionData>>(creationChanges.first());
-        const Qt3DInput::QActionData &cloneActionData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(creationChangeData->subjectId(), action->id());
-        QCOMPARE(creationChangeData->isNodeEnabled(), action->isEnabled());
-        QCOMPARE(creationChangeData->metaObject(), action->metaObject());
-        QCOMPARE(creationChangeData->parentId(), action->parentNode() ? action->parentNode()->id() : Qt3DCore::QNodeId());
-        QCOMPARE(cloneActionData.inputIds.size(), action->inputs().size());
-
-        const QVector<Qt3DInput::QAbstractActionInput *> &inputs = action->inputs();
-        for (int i = 0, m = inputs.size(); i < m; ++i)
-            QCOMPARE(cloneActionData.inputIds.at(i), inputs.at(i)->id());
-    }
 
     void checkPropertyUpdates()
     {
@@ -112,22 +64,18 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), action.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), action.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         action->removeInput(input);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), action.data());
-
-        arbiter.events.clear();
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), action.data());
     }
 
     void checkActionInputBookkeeping()
diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp
index be06cd8b2..985efb534 100644
--- a/tests/auto/input/qactioninput/tst_qactioninput.cpp
+++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp
@@ -30,14 +30,13 @@
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/private/qactioninput_p.h>
 #include <Qt3DInput/QActionInput>
 #include <Qt3DInput/QAbstractPhysicalDevice>
 
-#include "testpostmanarbiter.h"
 #include "testdevice.h"
+#include <testarbiter.h>
 
 class tst_QActionInput: public QObject
 {
@@ -49,47 +48,6 @@ public:
     }
 
 private Q_SLOTS:
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QActionInput *>("actionInput");
-
-        Qt3DInput::QActionInput *defaultConstructed = new Qt3DInput::QActionInput();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QActionInput *actionInputWithKeys = new Qt3DInput::QActionInput();
-        actionInputWithKeys->setButtons(QVector<int>() << ((1 << 1) | (1 << 5)));
-        QTest::newRow("actionInputWithKeys") << actionInputWithKeys;
-
-        Qt3DInput::QActionInput *actionInputWithKeysAndSourceDevice = new Qt3DInput::QActionInput();
-        TestDevice *device = new TestDevice();
-        actionInputWithKeysAndSourceDevice->setButtons(QVector<int>() << ((1 << 1) | (1 << 5)));
-        actionInputWithKeysAndSourceDevice->setSourceDevice(device);
-        QTest::newRow("actionInputWithKeysAndSourceDevice") << actionInputWithKeysAndSourceDevice;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QActionInput *, actionInput);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(actionInput);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + (actionInput->sourceDevice() ? 1 : 0));
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QActionInputData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QActionInputData>>(creationChanges.first());
-        const Qt3DInput::QActionInputData &cloneData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(actionInput->id(), creationChangeData->subjectId());
-        QCOMPARE(actionInput->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(actionInput->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(actionInput->buttons(), cloneData.buttons);
-        QCOMPARE(actionInput->sourceDevice() ? actionInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
-    }
 
     void checkPropertyUpdates()
     {
@@ -103,23 +61,22 @@ private Q_SLOTS:
         actionInput->setButtons(buttons);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), actionInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), actionInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         TestDevice *device = new TestDevice(actionInput.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
 
         actionInput->setSourceDevice(device);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), actionInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), actionInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkSourceDeviceBookkeeping()
diff --git a/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp
index c9abd0f4b..07149afef 100644
--- a/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp
+++ b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp
@@ -29,14 +29,13 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/QAbstractPhysicalDevice>
 #include <Qt3DInput/private/qanalogaxisinput_p.h>
 
-#include "testpostmanarbiter.h"
 #include "testdevice.h"
+#include <testarbiter.h>
 
 class tst_QAnalogAxisInput: public QObject
 {
@@ -48,45 +47,6 @@ public:
     }
 
 private Q_SLOTS:
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QAnalogAxisInput *>("axisInput");
-
-        Qt3DInput::QAnalogAxisInput *defaultConstructed = new Qt3DInput::QAnalogAxisInput();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QAnalogAxisInput *axisInputWithAxis = new Qt3DInput::QAnalogAxisInput();
-        axisInputWithAxis->setAxis(383);
-        QTest::newRow("axisInputWithAxis") << axisInputWithAxis;
-
-        Qt3DInput::QAnalogAxisInput *axisInputWithAxisAndSourceDevice = new Qt3DInput::QAnalogAxisInput();
-        TestDevice *device = new TestDevice();
-        axisInputWithAxisAndSourceDevice->setSourceDevice(device);
-        axisInputWithAxisAndSourceDevice->setAxis(427);
-        QTest::newRow("axisInputWithAxisAndSourceDevice") << axisInputWithAxisAndSourceDevice;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QAnalogAxisInput *, axisInput);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(axisInput);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + (axisInput->sourceDevice() ? 1 : 0));
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAnalogAxisInputData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAnalogAxisInputData>>(creationChanges.first());
-        const Qt3DInput::QAnalogAxisInputData &cloneData = creationChangeData->data;
-        QCOMPARE(axisInput->id(), creationChangeData->subjectId());
-        QCOMPARE(axisInput->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(axisInput->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axisInput->axis(), cloneData.axis);
-        QCOMPARE(axisInput->sourceDevice() ? axisInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
-    }
 
     void checkPropertyUpdates()
     {
@@ -99,23 +59,22 @@ private Q_SLOTS:
         axisInput->setAxis(350);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         TestDevice *device = new TestDevice(axisInput.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
 
         axisInput->setSourceDevice(device);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 };
 
diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp
index 9b3068442..e57b02bb3 100644
--- a/tests/auto/input/qaxis/tst_qaxis.cpp
+++ b/tests/auto/input/qaxis/tst_qaxis.cpp
@@ -29,13 +29,11 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/private/qaxis_p.h>
-
-#include "testpostmanarbiter.h"
+#include <testarbiter.h>
 
 class tst_QAxis: public QObject
 {
@@ -47,52 +45,6 @@ public:
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QAxis *>("axis");
-
-        Qt3DInput::QAxis *defaultConstructed = new Qt3DInput::QAxis();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QAxis *namedAxis = new Qt3DInput::QAxis();
-        QTest::newRow("namedAxis") << namedAxis;
-
-        Qt3DInput::QAxis *namedAxisWithInputs = new Qt3DInput::QAxis();
-        Qt3DInput::QAbstractAxisInput *axisInput1 = new Qt3DInput::QAnalogAxisInput();
-        Qt3DInput::QAbstractAxisInput *axisInput2 = new Qt3DInput::QAnalogAxisInput();
-        Qt3DInput::QAbstractAxisInput *axisInput3 = new Qt3DInput::QAnalogAxisInput();
-        namedAxisWithInputs->addInput(axisInput1);
-        namedAxisWithInputs->addInput(axisInput2);
-        namedAxisWithInputs->addInput(axisInput3);
-        QTest::newRow("namedAxisWithInputs") << namedAxisWithInputs;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QAxis *, axis);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(axis);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + axis->inputs().size());
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAxisData> creationChangeData =
-               qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAxisData>>(creationChanges.first());
-        const Qt3DInput::QAxisData &cloneData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(axis->id(), creationChangeData->subjectId());
-        QCOMPARE(axis->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(axis->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axis->inputs().count(), cloneData.inputIds.count());
-
-        for (int i = 0, m = axis->inputs().count(); i < m; ++i)
-            QCOMPARE(axis->inputs().at(i)->id(), cloneData.inputIds.at(i));
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -106,22 +58,20 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axis.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axis.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         axis->removeInput(input);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axis.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axis.data());
 
-        arbiter.events.clear();
+        arbiter.clear();
     }
 
     void checkAxisInputBookkeeping()
diff --git a/tests/auto/input/qaxisaccumulator/tst_qaxisaccumulator.cpp b/tests/auto/input/qaxisaccumulator/tst_qaxisaccumulator.cpp
index 9f96cd845..fea5d925a 100644
--- a/tests/auto/input/qaxisaccumulator/tst_qaxisaccumulator.cpp
+++ b/tests/auto/input/qaxisaccumulator/tst_qaxisaccumulator.cpp
@@ -29,13 +29,12 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/qaxis.h>
 #include <Qt3DInput/qaxisaccumulator.h>
 #include <Qt3DInput/private/qaxisaccumulator_p.h>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_QAxisAccumulator: public Qt3DInput::QAxisAccumulator
 {
@@ -47,76 +46,6 @@ public:
 
 private Q_SLOTS:
 
-    void checkCreationChange_data()
-    {
-        QTest::addColumn<QSharedPointer<Qt3DInput::QAxisAccumulator>>("accumulator");
-        QTest::addColumn<Qt3DInput::QAxis *>("sourceAxis");
-        QTest::addColumn<Qt3DInput::QAxisAccumulator::SourceAxisType>("sourceAxisType");
-        QTest::addColumn<float>("scale");
-
-        {
-            auto accumulator = QSharedPointer<Qt3DInput::QAxisAccumulator>::create();
-            QTest::newRow("defaultConstructed")
-                    << accumulator
-                    << static_cast<Qt3DInput::QAxis *>(nullptr)
-                    << Qt3DInput::QAxisAccumulator::Velocity
-                    << 1.0f;
-        }
-
-        {
-            auto accumulator = QSharedPointer<Qt3DInput::QAxisAccumulator>::create();
-            Qt3DInput::QAxis *axis = new Qt3DInput::QAxis();
-            accumulator->setSourceAxis(axis);
-            QTest::newRow("withSourceAxis")
-                    << accumulator
-                    << axis
-                    << Qt3DInput::QAxisAccumulator::Velocity
-                    << 1.0f;
-        }
-
-        {
-            auto accumulator = QSharedPointer<Qt3DInput::QAxisAccumulator>::create();
-            accumulator->setSourceAxisType(Qt3DInput::QAxisAccumulator::Acceleration);
-            accumulator->setScale(2.5f);
-            Qt3DInput::QAxis *axis = new Qt3DInput::QAxis();
-            accumulator->setSourceAxis(axis);
-            QTest::newRow("accelerationNonUniformScale")
-                    << accumulator
-                    << axis
-                    << Qt3DInput::QAxisAccumulator::Acceleration
-                    << 2.5f;
-        }
-    }
-
-    void checkCreationChange()
-    {
-        // GIVEN
-        QFETCH(QSharedPointer<Qt3DInput::QAxisAccumulator>, accumulator);
-        QFETCH(Qt3DInput::QAxis *, sourceAxis);
-        QFETCH(Qt3DInput::QAxisAccumulator::SourceAxisType, sourceAxisType);
-        QFETCH(float, scale);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(accumulator.data());
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), sourceAxis ? 2 : 1);
-
-        const auto creationChangeData =
-               qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAxisAccumulatorData>>(creationChanges.first());
-        const Qt3DInput::QAxisAccumulatorData &creationData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(accumulator->id(), creationChangeData->subjectId());
-        QCOMPARE(accumulator->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(accumulator->metaObject(), creationChangeData->metaObject());
-        if (sourceAxis)
-            QCOMPARE(sourceAxis->id(), creationData.sourceAxisId);
-        QCOMPARE(sourceAxisType, creationData.sourceAxisType);
-        QCOMPARE(scale, creationData.scale);
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -129,29 +58,29 @@ private Q_SLOTS:
         accumulator->setSourceAxis(axis);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), accumulator.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), accumulator.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
 
         // WHEN
         accumulator->setScale(2.0f);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), accumulator.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), accumulator.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         accumulator->setSourceAxisType(Qt3DInput::QAxisAccumulator::Acceleration);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), accumulator.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), accumulator.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkAxisInputBookkeeping()
diff --git a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
index e8ab3e172..6a53c1b89 100644
--- a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
+++ b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
@@ -29,13 +29,12 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QAbstractPhysicalDevice>
 #include <Qt3DInput/QButtonAxisInput>
 #include <Qt3DInput/private/qbuttonaxisinput_p.h>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 #include "testdevice.h"
 
 class tst_QButtonAxisInput: public QObject
@@ -60,56 +59,6 @@ private Q_SLOTS:
         QCOMPARE(axisInput.deceleration(), -1.0f);
     }
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QButtonAxisInput *>("axisInput");
-
-        Qt3DInput::QButtonAxisInput *defaultConstructed = new Qt3DInput::QButtonAxisInput();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QButtonAxisInput *axisInputWithKeys = new Qt3DInput::QButtonAxisInput();
-        axisInputWithKeys->setButtons(QVector<int>() << ((1 << 1) | (1 << 5)));
-        axisInputWithKeys->setScale(327.0f);
-        QTest::newRow("axisInputWithKeys") << axisInputWithKeys;
-
-        Qt3DInput::QButtonAxisInput *axisInputWithKeysAndSourceDevice = new Qt3DInput::QButtonAxisInput();
-        TestDevice *device = new TestDevice();
-        axisInputWithKeysAndSourceDevice->setButtons(QVector<int>() << ((1 << 1) | (1 << 5)));
-        axisInputWithKeysAndSourceDevice->setSourceDevice(device);
-        axisInputWithKeysAndSourceDevice->setScale(355.0f);
-        QTest::newRow("axisInputWithKeysAndSourceDevice") << axisInputWithKeysAndSourceDevice;
-
-        Qt3DInput::QButtonAxisInput *axisInputWithAcceleration = new Qt3DInput::QButtonAxisInput();
-        axisInputWithAcceleration->setAcceleration(41.0f);
-        axisInputWithAcceleration->setDeceleration(42.0f);
-        QTest::newRow("axisInputWithAcceleration") << axisInputWithAcceleration;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QButtonAxisInput *, axisInput);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(axisInput);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + (axisInput->sourceDevice() ? 1 : 0));
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QButtonAxisInputData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QButtonAxisInputData>>(creationChanges.first());
-        const Qt3DInput::QButtonAxisInputData &cloneData = creationChangeData->data;
-        QCOMPARE(axisInput->id(), creationChangeData->subjectId());
-        QCOMPARE(axisInput->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(axisInput->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axisInput->buttons(), cloneData.buttons);
-        QCOMPARE(axisInput->scale(), cloneData.scale);
-        QCOMPARE(axisInput->acceleration(), cloneData.acceleration);
-        QCOMPARE(axisInput->deceleration(), cloneData.deceleration);
-        QCOMPARE(axisInput->sourceDevice() ? axisInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -122,19 +71,19 @@ private Q_SLOTS:
         axisInput->setButtons(buttons);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         axisInput->setScale(1340.0f);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         TestDevice *device = new TestDevice(axisInput.data());
@@ -142,28 +91,28 @@ private Q_SLOTS:
         axisInput->setSourceDevice(device);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         axisInput->setAcceleration(42.0f);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         axisInput->setDeceleration(43.0f);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axisInput.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axisInput.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 };
 
diff --git a/tests/auto/input/qkeyboardhandler/tst_qkeyboardhandler.cpp b/tests/auto/input/qkeyboardhandler/tst_qkeyboardhandler.cpp
index 3f1e7fd09..7f1b7af62 100644
--- a/tests/auto/input/qkeyboardhandler/tst_qkeyboardhandler.cpp
+++ b/tests/auto/input/qkeyboardhandler/tst_qkeyboardhandler.cpp
@@ -29,13 +29,11 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QKeyboardDevice>
 #include <Qt3DInput/QKeyboardHandler>
 #include <Qt3DInput/private/qkeyboardhandler_p.h>
-
-#include "testpostmanarbiter.h"
+#include <testarbiter.h>
 
 class tst_QKeyboardHandler : public QObject
 {
@@ -47,44 +45,6 @@ public:
     }
 
 private Q_SLOTS:
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QKeyboardHandler *>("keyboardHandler");
-
-        auto defaultConstructed = new Qt3DInput::QKeyboardHandler;
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        auto handlerWithDevice = new Qt3DInput::QKeyboardHandler;
-        handlerWithDevice->setSourceDevice(new Qt3DInput::QKeyboardDevice);
-        QTest::newRow("handlerWithDevice") << handlerWithDevice;
-
-        auto handlerWithDeviceAndFocus = new Qt3DInput::QKeyboardHandler;
-        handlerWithDeviceAndFocus->setSourceDevice(new Qt3DInput::QKeyboardDevice);
-        handlerWithDeviceAndFocus->setFocus(true);
-        QTest::newRow("handlerWithDeviceAndFocus") << handlerWithDeviceAndFocus;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QKeyboardHandler *, keyboardHandler);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(keyboardHandler);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + (keyboardHandler->sourceDevice() ? 1 : 0));
-
-        auto creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QKeyboardHandlerData>>(creationChanges.first());
-        const Qt3DInput::QKeyboardHandlerData &cloneData = creationChangeData->data;
-        QCOMPARE(keyboardHandler->id(), creationChangeData->subjectId());
-        QCOMPARE(keyboardHandler->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(keyboardHandler->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(keyboardHandler->focus(), cloneData.focus);
-        QCOMPARE(keyboardHandler->sourceDevice() ? keyboardHandler->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.keyboardDeviceId);
-    }
 
     void checkPropertyUpdates()
     {
@@ -97,23 +57,23 @@ private Q_SLOTS:
         keyboardHandler->setFocus(true);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), keyboardHandler.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), keyboardHandler.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         auto device = new Qt3DInput::QKeyboardDevice(keyboardHandler.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
+        arbiter.clear();
 
         keyboardHandler->setSourceDevice(device);
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), keyboardHandler.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), keyboardHandler.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkSourceDeviceBookkeeping()
diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
index c7236ac7d..6e3616368 100644
--- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
+++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
@@ -29,14 +29,13 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QLogicalDevice>
 #include <Qt3DInput/private/qlogicaldevice_p.h>
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAction>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_QLogicalDevice: public QObject
 {
@@ -49,59 +48,6 @@ public:
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QLogicalDevice *>("logicalDevice");
-
-        Qt3DInput::QLogicalDevice *defaultConstructed = new Qt3DInput::QLogicalDevice();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QLogicalDevice *logicalDeviceWithActions = new Qt3DInput::QLogicalDevice();
-        logicalDeviceWithActions->addAction(new Qt3DInput::QAction());
-        logicalDeviceWithActions->addAction(new Qt3DInput::QAction());
-        logicalDeviceWithActions->addAction(new Qt3DInput::QAction());
-        QTest::newRow("logicalDeviceWithActions") << logicalDeviceWithActions;
-
-        Qt3DInput::QLogicalDevice *logicalDeviceWithAxes = new Qt3DInput::QLogicalDevice();
-        logicalDeviceWithAxes->addAxis(new Qt3DInput::QAxis());
-        logicalDeviceWithAxes->addAxis(new Qt3DInput::QAxis());
-        logicalDeviceWithAxes->addAxis(new Qt3DInput::QAxis());
-        QTest::newRow("logicalDeviceWithAxes") << logicalDeviceWithAxes;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QLogicalDevice *, logicalDevice);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(logicalDevice);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        const int axesCount = logicalDevice->axes().count();
-        const int actionsCount = logicalDevice->actions().count();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + axesCount + actionsCount);
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QLogicalDeviceData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QLogicalDeviceData>>(creationChanges.first());
-        const Qt3DInput::QLogicalDeviceData &cloneData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(logicalDevice->id(), creationChangeData->subjectId());
-        QCOMPARE(logicalDevice->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(logicalDevice->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axesCount, cloneData.axisIds.count());
-        QCOMPARE(actionsCount, cloneData.actionIds.count());
-
-        for (int i = 0; i < axesCount; ++i)
-            QCOMPARE(logicalDevice->axes().at(i)->id(), cloneData.axisIds.at(i));
-
-        for (int i = 0; i < actionsCount; ++i)
-            QCOMPARE(logicalDevice->actions().at(i)->id(), cloneData.actionIds.at(i));
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -112,54 +58,50 @@ private Q_SLOTS:
         // WHEN
         Qt3DInput::QAction *action = new Qt3DInput::QAction(logicalDevice.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
+        arbiter.clear();
 
         logicalDevice->addAction(action);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), logicalDevice.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         logicalDevice->removeAction(action);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), logicalDevice.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         Qt3DInput::QAxis *axis = new Qt3DInput::QAxis(logicalDevice.data());
         QCoreApplication::processEvents();
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         logicalDevice->addAxis(axis);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), logicalDevice.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         logicalDevice->removeAxis(axis);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), logicalDevice.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkAxisBookkeeping()
diff --git a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
index 6a8f39c71..cd899d661 100644
--- a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
+++ b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
@@ -33,9 +33,7 @@
 #include <Qt3DInput/private/qmousedevice_p.h>
 #include <QObject>
 #include <QSignalSpy>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
-#include <Qt3DCore/qnodecreatedchange.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_QMouseDevice : public QObject
 {
@@ -118,58 +116,6 @@ private Q_SLOTS:
         }
     }
 
-    void checkCreationData()
-    {
-        // GIVEN
-        Qt3DInput::QMouseDevice mouseDevice;
-
-        mouseDevice.setSensitivity(0.8f);
-
-        // WHEN
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&mouseDevice);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QMouseDeviceData>>(creationChanges.first());
-            const Qt3DInput::QMouseDeviceData cloneData = creationChangeData->data;
-
-            QCOMPARE(mouseDevice.sensitivity(), cloneData.sensitivity);
-            QCOMPARE(mouseDevice.id(), creationChangeData->subjectId());
-            QCOMPARE(mouseDevice.isEnabled(), true);
-            QCOMPARE(mouseDevice.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(mouseDevice.metaObject(), creationChangeData->metaObject());
-        }
-
-        // WHEN
-        mouseDevice.setEnabled(false);
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&mouseDevice);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QMouseDeviceData>>(creationChanges.first());
-            const Qt3DInput::QMouseDeviceData cloneData = creationChangeData->data;
-
-            QCOMPARE(mouseDevice.sensitivity(), cloneData.sensitivity);
-            QCOMPARE(mouseDevice.id(), creationChangeData->subjectId());
-            QCOMPARE(mouseDevice.isEnabled(), false);
-            QCOMPARE(mouseDevice.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(mouseDevice.metaObject(), creationChangeData->metaObject());
-        }
-    }
-
     void checkSensitivityUpdate()
     {
         // GIVEN
@@ -181,16 +127,16 @@ private Q_SLOTS:
             // WHEN
             mouseDevice.setSensitivity(0.7f);
             // THEN
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &mouseDevice);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &mouseDevice);
         }
 
         {
             // WHEN
             mouseDevice.setSensitivity(0.7f);
 
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &mouseDevice);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &mouseDevice);
         }
 
     }
@@ -206,16 +152,16 @@ private Q_SLOTS:
             // WHEN
             mouseDevice.setUpdateAxesContinuously(true);
             // THEN
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &mouseDevice);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &mouseDevice);
         }
 
         {
             // WHEN
             mouseDevice.setSensitivity(true);
 
-            QCOMPARE(arbiter.dirtyNodes.size(), 1);
-            QCOMPARE(arbiter.dirtyNodes.front(), &mouseDevice);
+            QCOMPARE(arbiter.dirtyNodes().size(), 1);
+            QCOMPARE(arbiter.dirtyNodes().front(), &mouseDevice);
         }
 
     }
diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp
index 14a289556..daa03efd9 100644
--- a/tests/auto/input/utils/tst_utils.cpp
+++ b/tests/auto/input/utils/tst_utils.cpp
@@ -133,7 +133,7 @@ private Q_SLOTS:
         // WHEN -> Create backend PhysicalProxiDevice
         Qt3DInput::Input::PhysicalDeviceProxy *backendProxyDevice = handler.physicalDeviceProxyManager()->getOrCreateResource(testProxyPhysicalDevice.id());
         backendProxyDevice->setManager(handler.physicalDeviceProxyManager());
-        simulateInitialization(&testProxyPhysicalDevice, backendProxyDevice);
+        simulateInitializationSync(&testProxyPhysicalDevice, backendProxyDevice);
         backendProxyDevice->setDevice(&testPhysicalDevice);
 
         // THEN
@@ -204,7 +204,7 @@ private Q_SLOTS:
         // WHEN -> Create backend PhysicalProxiDevice
         Qt3DInput::Input::PhysicalDeviceProxy *backendProxyDevice = handler.physicalDeviceProxyManager()->getOrCreateResource(testProxyPhysicalDevice.id());
         backendProxyDevice->setManager(handler.physicalDeviceProxyManager());
-        simulateInitialization(&testProxyPhysicalDevice, backendProxyDevice);
+        simulateInitializationSync(&testProxyPhysicalDevice, backendProxyDevice);
         backendProxyDevice->setDevice(&testPhysicalDevice2);
 
         // THEN