diff --git a/test/BuildingRegistry.Tests/ProjectionTests/Integration/BuildingUnit/BuildingUnitVersionProjectionsTests-LegacyBuildingEvents.cs b/test/BuildingRegistry.Tests/ProjectionTests/Integration/BuildingUnit/BuildingUnitVersionProjectionsTests-LegacyBuildingEvents.cs
index 946d29ee9..574fcd3e6 100644
--- a/test/BuildingRegistry.Tests/ProjectionTests/Integration/BuildingUnit/BuildingUnitVersionProjectionsTests-LegacyBuildingEvents.cs
+++ b/test/BuildingRegistry.Tests/ProjectionTests/Integration/BuildingUnit/BuildingUnitVersionProjectionsTests-LegacyBuildingEvents.cs
@@ -2,9 +2,7 @@
 #pragma warning disable CS0618 // Type or member is obsolete
 namespace BuildingRegistry.Tests.ProjectionTests.Integration.BuildingUnit
 {
-    using System;
     using System.Collections.Generic;
-    using System.Threading;
     using System.Threading.Tasks;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
@@ -12,7 +10,6 @@ namespace BuildingRegistry.Tests.ProjectionTests.Integration.BuildingUnit
     using BuildingRegistry.Building;
     using BuildingRegistry.Legacy.Events;
     using FluentAssertions;
-    using Moq;
     using Projections.Integration.Converters;
     using Tests.Legacy.Autofixture;
     using Xunit;
@@ -28,25 +25,17 @@ public async Task WhenBuildingWasRemoved()
             _fixture.Customize(new WithFixedBuildingId());
             _fixture.Customize(new WithFixedBuildingUnitIdFromHouseNumber());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
-
             var buildingUnitPersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitPersistentLocalId);
-
             var buildingUnitWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingWasRemoved =  new BuildingWasRemoved(
                 _fixture.Create<BuildingId>(),
                 new [] { _fixture.Create<BuildingUnitId>() });
             ((ISetProvenance)buildingWasRemoved).SetProvenance(_fixture.Create<Provenance>());
 
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitWasAdded.AddressId))
-                .ReturnsAsync(1);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitPersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitWasAdded.AddressId);
 
             var position = _fixture.Create<long>();
 
@@ -79,9 +68,8 @@ public async Task WhenBuildingWasRetired()
         {
             _fixture.Customize(new WithFixedBuildingId());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
+            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
+            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
             var buildingUnitToNotRealizeWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingUnitToRetireWasAdded = _fixture.Create<BuildingUnitWasAdded>();
@@ -91,27 +79,11 @@ public async Task WhenBuildingWasRetired()
                 new [] { new BuildingUnitId(buildingUnitToNotRealizeWasAdded.BuildingUnitId) });
             ((ISetProvenance)buildingWasRetired).SetProvenance(_fixture.Create<Provenance>());
 
-            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToNotRealizeWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToNotRealizePersistentLocalId);
-
-            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToRetireWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToRetirePersistentLocalId);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId))
-                .ReturnsAsync(1);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId))
-                .ReturnsAsync(2);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitToNotRealizeWasAdded.BuildingUnitId, buildingUnitToNotRealizePersistentLocalId);
+            AddBuildingUnitPersistentLocalId(buildingUnitToRetireWasAdded.BuildingUnitId, buildingUnitToRetirePersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId, 1);
+            AddAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId, 2);
 
             var position = _fixture.Create<long>();
 
@@ -154,9 +126,8 @@ public async Task WhenBuildingWasCorrectedToRetired()
         {
             _fixture.Customize(new WithFixedBuildingId());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
+            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
+            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
             var buildingUnitToNotRealizeWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingUnitToRetireWasAdded = _fixture.Create<BuildingUnitWasAdded>();
@@ -166,27 +137,11 @@ public async Task WhenBuildingWasCorrectedToRetired()
                 new [] { new BuildingUnitId(buildingUnitToNotRealizeWasAdded.BuildingUnitId) });
             ((ISetProvenance)buildingWasCorrectedToRetired).SetProvenance(_fixture.Create<Provenance>());
 
-            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToNotRealizeWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToNotRealizePersistentLocalId);
-
-            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToRetireWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToRetirePersistentLocalId);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId))
-                .ReturnsAsync(1);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId))
-                .ReturnsAsync(2);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitToNotRealizeWasAdded.BuildingUnitId, buildingUnitToNotRealizePersistentLocalId);
+            AddBuildingUnitPersistentLocalId(buildingUnitToRetireWasAdded.BuildingUnitId, buildingUnitToRetirePersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId, 1);
+            AddAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId, 2);
 
             var position = _fixture.Create<long>();
 
@@ -229,9 +184,8 @@ public async Task WhenBuildingWasNotRealized()
         {
             _fixture.Customize(new WithFixedBuildingId());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
+            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
+            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
             var buildingUnitToNotRealizeWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingUnitToRetireWasAdded = _fixture.Create<BuildingUnitWasAdded>();
@@ -241,27 +195,11 @@ public async Task WhenBuildingWasNotRealized()
                 new [] { new BuildingUnitId(buildingUnitToNotRealizeWasAdded.BuildingUnitId) });
             ((ISetProvenance)buildingWasNotRealized).SetProvenance(_fixture.Create<Provenance>());
 
-            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToNotRealizeWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToNotRealizePersistentLocalId);
-
-            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToRetireWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToRetirePersistentLocalId);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId))
-                .ReturnsAsync(1);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId))
-                .ReturnsAsync(2);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitToNotRealizeWasAdded.BuildingUnitId, buildingUnitToNotRealizePersistentLocalId);
+            AddBuildingUnitPersistentLocalId(buildingUnitToRetireWasAdded.BuildingUnitId, buildingUnitToRetirePersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId, 1);
+            AddAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId, 2);
 
             var position = _fixture.Create<long>();
 
@@ -304,9 +242,8 @@ public async Task WhenBuildingWasCorrectedToNotRealized()
         {
             _fixture.Customize(new WithFixedBuildingId());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
+            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
+            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
             var buildingUnitToNotRealizeWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingUnitToRetireWasAdded = _fixture.Create<BuildingUnitWasAdded>();
@@ -316,27 +253,11 @@ public async Task WhenBuildingWasCorrectedToNotRealized()
                 new [] { new BuildingUnitId(buildingUnitToNotRealizeWasAdded.BuildingUnitId) });
             ((ISetProvenance)buildingWasCorrectedToNotRealized).SetProvenance(_fixture.Create<Provenance>());
 
-            var buildingUnitToNotRealizePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToNotRealizeWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToNotRealizePersistentLocalId);
-
-            var buildingUnitToRetirePersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
-
-            _persistentLocalIdFinder
-                .Setup(x =>
-                    x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), buildingUnitToRetireWasAdded.BuildingUnitId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitToRetirePersistentLocalId);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId))
-                .ReturnsAsync(1);
-
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId))
-                .ReturnsAsync(2);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitToNotRealizeWasAdded.BuildingUnitId, buildingUnitToNotRealizePersistentLocalId);
+            AddBuildingUnitPersistentLocalId(buildingUnitToRetireWasAdded.BuildingUnitId, buildingUnitToRetirePersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitToNotRealizeWasAdded.AddressId, 1);
+            AddAddressPersistentLocalId(buildingUnitToRetireWasAdded.AddressId, 2);
 
             var position = _fixture.Create<long>();
 
@@ -380,23 +301,15 @@ public async Task WhenBuildingGeometryWasRemoved()
             _fixture.Customize(new WithFixedBuildingId());
             _fixture.Customize(new WithFixedBuildingUnitIdFromHouseNumber());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
-
             var buildingUnitPersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitPersistentLocalId);
-
             var buildingUnitWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingUnitPositionWasAppointedByAdministrator = _fixture.Create<BuildingUnitPositionWasAppointedByAdministrator>();
             var buildingGeometryWasRemoved = _fixture.Create<BuildingGeometryWasRemoved>();
 
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitWasAdded.AddressId))
-                .ReturnsAsync(1);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitPersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitWasAdded.AddressId);
 
             var position = _fixture.Create<long>();
 
@@ -437,22 +350,14 @@ public async Task WhenBuildingBecameComplete()
             _fixture.Customize(new WithFixedBuildingId());
             _fixture.Customize(new WithFixedBuildingUnitIdFromHouseNumber());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
-
             var buildingUnitPersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitPersistentLocalId);
-
             var buildingUnitWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingBecameComplete = _fixture.Create<BuildingBecameComplete>();
 
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitWasAdded.AddressId))
-                .ReturnsAsync(1);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitPersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitWasAdded.AddressId);
 
             var position = _fixture.Create<long>();
 
@@ -484,22 +389,14 @@ public async Task WhenBuildingBecameIncomplete()
             _fixture.Customize(new WithFixedBuildingId());
             _fixture.Customize(new WithFixedBuildingUnitIdFromHouseNumber());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
-
             var buildingUnitPersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitPersistentLocalId);
-
             var buildingUnitWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingBecameIncomplete = _fixture.Create<BuildingBecameIncomplete>();
 
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitWasAdded.AddressId))
-                .ReturnsAsync(1);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitPersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitWasAdded.AddressId);
 
             var position = _fixture.Create<long>();
 
@@ -531,22 +428,14 @@ public async Task WhenBuildingPersistentLocalIdWasAssigned()
             _fixture.Customize(new WithFixedBuildingId());
             _fixture.Customize(new WithFixedBuildingUnitIdFromHouseNumber());
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingPersistentLocalId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync((int) _fixture.Create<BuildingPersistentLocalId>());
-
             var buildingUnitPersistentLocalId = (int) _fixture.Create<BuildingUnitPersistentLocalId>();
 
-            _persistentLocalIdFinder
-                .Setup(x => x.FindBuildingUnitPersistentLocalId(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(buildingUnitPersistentLocalId);
-
             var buildingUnitWasAdded = _fixture.Create<BuildingUnitWasAdded>();
             var buildingPersistentLocalIdWasAssigned = _fixture.Create<BuildingPersistentLocalIdWasAssigned>();
 
-            _addresses
-                .Setup(x => x.GetAddressPersistentLocalId(buildingUnitWasAdded.AddressId))
-                .ReturnsAsync(1);
+            AddBuildingPersistentLocalId();
+            AddBuildingUnitPersistentLocalId(buildingUnitPersistentLocalId);
+            AddAddressPersistentLocalId(buildingUnitWasAdded.AddressId);
 
             var position = _fixture.Create<long>();