use IndividualAggregator.dup () in tests and tools

The default constructor has been deprecated.

https://bugzilla.gnome.org/show_bug.cgi?id=705289

103 files changed, 119 insertions, 119 deletions

diff --git a/tests/eds/add-contacts-stress-test.vala b/tests/eds/add-contacts-stress-test.vala
index bd7fe0cb..fb024e77 100644
--- a/tests/eds/add-contacts-stress-test.vala
+++ b/tests/eds/add-contacts-stress-test.vala
@@ -77,7 +77,7 @@ public class AddContactsStressTestTests : EdsTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/add-persona.vala b/tests/eds/add-persona.vala
index 178fcb37..ce64ce19 100644
--- a/tests/eds/add-persona.vala
+++ b/tests/eds/add-persona.vala
@@ -113,7 +113,7 @@ public class AddPersonaTests : EdsTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/anti-linking.vala b/tests/eds/anti-linking.vala
index dd519149..ef7fd0f3 100644
--- a/tests/eds/anti-linking.vala
+++ b/tests/eds/anti-linking.vala
@@ -119,7 +119,7 @@ public class AntiLinkingTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_aggregate_after_change_cb);
       try
@@ -240,7 +240,7 @@ public class AntiLinkingTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_anti_linking_removal_cb);
       try
diff --git a/tests/eds/avatar-details.vala b/tests/eds/avatar-details.vala
index 21802f36..6c674669 100644
--- a/tests/eds/avatar-details.vala
+++ b/tests/eds/avatar-details.vala
@@ -70,7 +70,7 @@ public class AvatarDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/create-remove-stores.vala b/tests/eds/create-remove-stores.vala
index d189005a..51df74a9 100644
--- a/tests/eds/create-remove-stores.vala
+++ b/tests/eds/create-remove-stores.vala
@@ -79,7 +79,7 @@ public class CreateRemoveStoresTests : EdsTest.TestCase
   private async void _test_creating_removing_stores_async ()
     {
       yield this._backend_store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       try
         {
           yield this._backend_store.load_backends ();
diff --git a/tests/eds/email-details.vala b/tests/eds/email-details.vala
index f077c9cd..99380b2f 100644
--- a/tests/eds/email-details.vala
+++ b/tests/eds/email-details.vala
@@ -107,7 +107,7 @@ public class EmailDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/enable-disable-stores.vala b/tests/eds/enable-disable-stores.vala
index 5ba1fce1..335ce7cb 100644
--- a/tests/eds/enable-disable-stores.vala
+++ b/tests/eds/enable-disable-stores.vala
@@ -85,7 +85,7 @@ public class EnableDisableStoresTests : EdsTest.TestCase
   private async void _test_disabling_stores_async ()
     {
       yield this._backend_store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       try
         {
           yield this._backend_store.load_backends ();
diff --git a/tests/eds/helper-prepare-aggregator.vala b/tests/eds/helper-prepare-aggregator.vala
index a7b674e9..1b71a6bb 100644
--- a/tests/eds/helper-prepare-aggregator.vala
+++ b/tests/eds/helper-prepare-aggregator.vala
@@ -135,7 +135,7 @@ public class Main
       yield TestUtils.backend_prepare_and_wait_for_quiescence ((!) eds);
 
       message ("%.6f Waiting for aggregator", Test.timer_elapsed ());
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       yield TestUtils.aggregator_prepare_and_wait_for_quiescence (aggregator);
 
       var map = aggregator.individuals;
diff --git a/tests/eds/im-details.vala b/tests/eds/im-details.vala
index e0a89869..230e8f2d 100644
--- a/tests/eds/im-details.vala
+++ b/tests/eds/im-details.vala
@@ -79,7 +79,7 @@ public class ImDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/individual-retrieval.vala b/tests/eds/individual-retrieval.vala
index a02c6744..b3ea06d3 100644
--- a/tests/eds/individual-retrieval.vala
+++ b/tests/eds/individual-retrieval.vala
@@ -75,7 +75,7 @@ public class IndividualRetrievalTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/link-personas-diff-stores.vala b/tests/eds/link-personas-diff-stores.vala
index 8701bcfa..fa781ef8 100644
--- a/tests/eds/link-personas-diff-stores.vala
+++ b/tests/eds/link-personas-diff-stores.vala
@@ -86,7 +86,7 @@ public class LinkPersonasDiffStoresTests : EdsTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/link-personas.vala b/tests/eds/link-personas.vala
index 74f72dda..924ba657 100644
--- a/tests/eds/link-personas.vala
+++ b/tests/eds/link-personas.vala
@@ -134,7 +134,7 @@ public class LinkPersonasTests : EdsTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/linkable-properties.vala b/tests/eds/linkable-properties.vala
index 44512b74..f89957ed 100644
--- a/tests/eds/linkable-properties.vala
+++ b/tests/eds/linkable-properties.vala
@@ -114,7 +114,7 @@ public class LinkablePropertiesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_aggregate_after_change_cb);
       try
diff --git a/tests/eds/name-details.vala b/tests/eds/name-details.vala
index bb292beb..31add088 100644
--- a/tests/eds/name-details.vala
+++ b/tests/eds/name-details.vala
@@ -98,7 +98,7 @@ public class NameDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/perf.vala b/tests/eds/perf.vala
index 1609bf77..622930c2 100644
--- a/tests/eds/perf.vala
+++ b/tests/eds/perf.vala
@@ -106,7 +106,7 @@ public class PerfTests : EdsTest.TestCase
       yield TestUtils.backend_prepare_and_wait_for_quiescence ((!) eds);
 
       message ("%.6f Preparing aggregator", Test.timer_elapsed ());
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       yield aggregator.prepare ();
 
       message ("%.6f Waiting for aggregator", Test.timer_elapsed ());
diff --git a/tests/eds/phone-details.vala b/tests/eds/phone-details.vala
index b62e4449..05059daf 100644
--- a/tests/eds/phone-details.vala
+++ b/tests/eds/phone-details.vala
@@ -99,7 +99,7 @@ public class PhoneDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/postal-address-details.vala b/tests/eds/postal-address-details.vala
index 22abe627..cfc8c717 100644
--- a/tests/eds/postal-address-details.vala
+++ b/tests/eds/postal-address-details.vala
@@ -102,7 +102,7 @@ public class PostalAddressDetailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/remove-persona.vala b/tests/eds/remove-persona.vala
index 297953c6..37a01ff8 100644
--- a/tests/eds/remove-persona.vala
+++ b/tests/eds/remove-persona.vala
@@ -62,7 +62,7 @@ public class RemovePersonaTests : EdsTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/removing-contacts.vala b/tests/eds/removing-contacts.vala
index cb640acc..7c70cdfd 100644
--- a/tests/eds/removing-contacts.vala
+++ b/tests/eds/removing-contacts.vala
@@ -66,7 +66,7 @@ public class RemovingContactsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-avatar.vala b/tests/eds/set-avatar.vala
index 318954f8..e317e2f5 100644
--- a/tests/eds/set-avatar.vala
+++ b/tests/eds/set-avatar.vala
@@ -75,7 +75,7 @@ public class SetAvatarTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
@@ -180,7 +180,7 @@ public class SetAvatarTests : EdsTest.TestCase
       var store = BackendStore.dup ();
       yield store.prepare ();
 
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
diff --git a/tests/eds/set-birthday.vala b/tests/eds/set-birthday.vala
index d5fb7c32..cb5021c7 100644
--- a/tests/eds/set-birthday.vala
+++ b/tests/eds/set-birthday.vala
@@ -67,7 +67,7 @@ public class SetBirthdayTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-emails.vala b/tests/eds/set-emails.vala
index 2d575d9b..55d83f86 100644
--- a/tests/eds/set-emails.vala
+++ b/tests/eds/set-emails.vala
@@ -66,7 +66,7 @@ public class SetEmailsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-gender.vala b/tests/eds/set-gender.vala
index 6cab286f..cf6e742f 100644
--- a/tests/eds/set-gender.vala
+++ b/tests/eds/set-gender.vala
@@ -67,7 +67,7 @@ public class SetGenderTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect (
           this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-im-addresses.vala b/tests/eds/set-im-addresses.vala
index 8dd1c618..4f2791b6 100644
--- a/tests/eds/set-im-addresses.vala
+++ b/tests/eds/set-im-addresses.vala
@@ -67,7 +67,7 @@ public class SetIMAddressesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-is-favourite.vala b/tests/eds/set-is-favourite.vala
index 5ff7b231..3a936de5 100644
--- a/tests/eds/set-is-favourite.vala
+++ b/tests/eds/set-is-favourite.vala
@@ -67,7 +67,7 @@ public class SetIsFavouriteTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect (
           this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-names.vala b/tests/eds/set-names.vala
index f1fee50e..0e24f282 100644
--- a/tests/eds/set-names.vala
+++ b/tests/eds/set-names.vala
@@ -76,7 +76,7 @@ public class SetNamesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect (
           this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-notes.vala b/tests/eds/set-notes.vala
index 1264cd25..8baa5d27 100644
--- a/tests/eds/set-notes.vala
+++ b/tests/eds/set-notes.vala
@@ -68,7 +68,7 @@ public class SetNotesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-phones.vala b/tests/eds/set-phones.vala
index eeed3ce7..ea1dcb5a 100644
--- a/tests/eds/set-phones.vala
+++ b/tests/eds/set-phones.vala
@@ -68,7 +68,7 @@ public class SetPhonesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-postal-addresses.vala b/tests/eds/set-postal-addresses.vala
index 54a923dc..b1ce391f 100644
--- a/tests/eds/set-postal-addresses.vala
+++ b/tests/eds/set-postal-addresses.vala
@@ -74,7 +74,7 @@ public class SetPostalAddressesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-properties-race.vala b/tests/eds/set-properties-race.vala
index bfdf8d85..68457e7a 100644
--- a/tests/eds/set-properties-race.vala
+++ b/tests/eds/set-properties-race.vala
@@ -74,7 +74,7 @@ public class SetPropertiesRaceTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-roles.vala b/tests/eds/set-roles.vala
index 188ee173..c0c064e4 100644
--- a/tests/eds/set-roles.vala
+++ b/tests/eds/set-roles.vala
@@ -68,7 +68,7 @@ public class SetRolesTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-structured-name.vala b/tests/eds/set-structured-name.vala
index 7adc3887..fd5053cf 100644
--- a/tests/eds/set-structured-name.vala
+++ b/tests/eds/set-structured-name.vala
@@ -69,7 +69,7 @@ public class SetStructuredNameTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/set-urls.vala b/tests/eds/set-urls.vala
index 5fa06f3a..d828f768 100644
--- a/tests/eds/set-urls.vala
+++ b/tests/eds/set-urls.vala
@@ -81,7 +81,7 @@ public class SetUrlsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/eds/store-removed.vala b/tests/eds/store-removed.vala
index 4d6e282d..9dd017ab 100644
--- a/tests/eds/store-removed.vala
+++ b/tests/eds/store-removed.vala
@@ -78,7 +78,7 @@ public class StoreRemovedTests : EdsTest.TestCase
       var store = BackendStore.dup ();
       yield store.prepare ();
 
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
 
       ulong signal_id = 0;
       signal_id = this._aggregator.individuals_changed_detailed.connect (
diff --git a/tests/eds/updating-contacts.vala b/tests/eds/updating-contacts.vala
index 35648ab7..5765b0ac 100644
--- a/tests/eds/updating-contacts.vala
+++ b/tests/eds/updating-contacts.vala
@@ -66,7 +66,7 @@ public class UpdatingContactsTests : EdsTest.TestCase
 
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/folks/aggregation.vala b/tests/folks/aggregation.vala
index 024e296c..2f9c2d6d 100644
--- a/tests/folks/aggregation.vala
+++ b/tests/folks/aggregation.vala
@@ -129,7 +129,7 @@ public class AggregationTests : TpfTest.MixedTestCase
         }
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var removed = changes.get_keys ();
@@ -262,7 +262,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       weak Individual individual2_detailed = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var removed = changes.get_keys ();
@@ -438,7 +438,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       weak Individual individual2_detailed = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var removed = changes.get_keys ();
@@ -616,7 +616,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       Individual user_individual_detailed = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       var individuals_changed_detailed_id =
           aggregator.individuals_changed_detailed.connect ((changes) =>
         {
@@ -746,7 +746,7 @@ public class AggregationTests : TpfTest.MixedTestCase
           "me2@example.com", "cm", "account2");
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       var individuals_changed_detailed_id =
           aggregator.individuals_changed_detailed.connect ((changes) =>
         {
@@ -867,7 +867,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       var individuals_map = new HashMap<string, IndividualState> ();
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       var aggregator_is_finalising = false;
 
       aggregator.individuals_changed.connect ((added, removed, m, a, r) =>
@@ -981,7 +981,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       Individual? individual = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           assert (changes.size == 1);
@@ -1095,7 +1095,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       Individual? individual = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       var individuals_changed_id =
           aggregator.individuals_changed_detailed.connect ((changes) =>
         {
@@ -1270,7 +1270,7 @@ public class AggregationTests : TpfTest.MixedTestCase
       Individual? individual = null;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           assert (changes.size == 1);
diff --git a/tests/folks/init.vala b/tests/folks/init.vala
index b7318e99..289b9b73 100644
--- a/tests/folks/init.vala
+++ b/tests/folks/init.vala
@@ -62,7 +62,7 @@ public class InitTests : TpfTest.MixedTestCase
       /* Wreak havoc. */
       for (uint i = 0; i < 10; i++)
         {
-          var aggregator = new IndividualAggregator ();
+          var aggregator = IndividualAggregator.dup ();
           aggregator.prepare (); /* Note: We don't yield for this to complete */
           aggregator = null;
         }
@@ -124,7 +124,7 @@ public class InitTests : TpfTest.MixedTestCase
 
       for (uint i = 0; i < 10; i++)
         {
-          var aggregator = new IndividualAggregator ();
+          var aggregator = IndividualAggregator.dup ();
 
           try
             {
diff --git a/tests/key-file/individual-retrieval.vala b/tests/key-file/individual-retrieval.vala
index 546bb46e..42ca8744 100644
--- a/tests/key-file/individual-retrieval.vala
+++ b/tests/key-file/individual-retrieval.vala
@@ -50,7 +50,7 @@ public class IndividualRetrievalTests : KfTest.TestCase
       expected_individuals.add ("1");
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
@@ -103,7 +103,7 @@ public class IndividualRetrievalTests : KfTest.TestCase
           "msn=foo@hotmail.com\n");
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       uint individuals_changed_count = 0;
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
diff --git a/tests/libsocialweb/aggregation.vala b/tests/libsocialweb/aggregation.vala
index 6d47bec2..ecb4c13f 100644
--- a/tests/libsocialweb/aggregation.vala
+++ b/tests/libsocialweb/aggregation.vala
@@ -161,7 +161,7 @@ public class AggregationTests : LibsocialwebTest.TestCase
             });
         });
 
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       Individual[] individual_gathered = new Individual[0];
       var handler_id =
           aggregator.individuals_changed_detailed.connect ((changes) =>
diff --git a/tests/libsocialweb/dummy-lsw.vala b/tests/libsocialweb/dummy-lsw.vala
index 4cccffd9..d340e031 100644
--- a/tests/libsocialweb/dummy-lsw.vala
+++ b/tests/libsocialweb/dummy-lsw.vala
@@ -106,7 +106,7 @@ public class DummyLswTests : LibsocialwebTest.TestCase
             });
         });
 
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       Individual? i1 = null;
       Individual? i2 = null;
       var handler_id =
diff --git a/tests/telepathy/fake-tp-backend.vala b/tests/telepathy/fake-tp-backend.vala
index 14f4a7d6..407e8f4a 100644
--- a/tests/telepathy/fake-tp-backend.vala
+++ b/tests/telepathy/fake-tp-backend.vala
@@ -35,7 +35,7 @@ public int main (string[] args)
   var main_loop = new GLib.MainLoop (null, false);
 
   /* Set up the aggregator */
-  var aggregator = new IndividualAggregator ();
+  var aggregator = IndividualAggregator.dup ();
 
   Idle.add (() =>
     {
diff --git a/tests/telepathy/individual-properties.vala b/tests/telepathy/individual-properties.vala
index e3556619..45acb62c 100644
--- a/tests/telepathy/individual-properties.vala
+++ b/tests/telepathy/individual-properties.vala
@@ -61,7 +61,7 @@ public class IndividualPropertiesTests : TpfTest.TestCase
       var main_loop = new GLib.MainLoop (null, false);
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
@@ -191,7 +191,7 @@ public class IndividualPropertiesTests : TpfTest.TestCase
       var alias_notified = false;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
@@ -264,7 +264,7 @@ public class IndividualPropertiesTests : TpfTest.TestCase
       var alias_notified = false;
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
@@ -342,7 +342,7 @@ public class IndividualPropertiesTests : TpfTest.TestCase
       this._changes_pending.add ("urls");
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           this._change_contact_info_aggregator_individuals_added.begin (changes);
diff --git a/tests/telepathy/individual-retrieval.vala b/tests/telepathy/individual-retrieval.vala
index 5919e3d0..8524240a 100644
--- a/tests/telepathy/individual-retrieval.vala
+++ b/tests/telepathy/individual-retrieval.vala
@@ -74,7 +74,7 @@ public class IndividualRetrievalTests : TpfTest.TestCase
         expected_individuals.add (id);
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
           var added = changes.get_values ();
@@ -136,7 +136,7 @@ public class IndividualRetrievalTests : TpfTest.TestCase
       added_individuals.add ("carl-brutananadilewski@example.com");
 
       /* Set up the aggregator */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
 
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
diff --git a/tests/telepathy/individual-zeitgeist.vala b/tests/telepathy/individual-zeitgeist.vala
index 6e047e28..5d62942a 100644
--- a/tests/telepathy/individual-zeitgeist.vala
+++ b/tests/telepathy/individual-zeitgeist.vala
@@ -47,7 +47,7 @@ public int main (string[] args)
 {
   var main_loop = new GLib.MainLoop (null, false);
   /* Set up the aggregator */
-  var aggregator = new IndividualAggregator ();
+  var aggregator = IndividualAggregator.dup ();
 
   aggregator.notify["is-quiescent"].connect (() =>
     {
diff --git a/tests/telepathy/init.vala b/tests/telepathy/init.vala
index f842a07a..44bca605 100644
--- a/tests/telepathy/init.vala
+++ b/tests/telepathy/init.vala
@@ -37,7 +37,7 @@ public class InitTests : TpfTest.TestCase
       var main_loop = new GLib.MainLoop (null, false);
 
       /* Main test code. */
-      var aggregator = new IndividualAggregator ();
+      var aggregator = IndividualAggregator.dup ();
 
       Idle.add (() =>
         {
diff --git a/tests/tracker/add-contact.vala b/tests/tracker/add-contact.vala
index e921fe85..8f0fe9d5 100644
--- a/tests/tracker/add-contact.vala
+++ b/tests/tracker/add-contact.vala
@@ -59,7 +59,7 @@ public class AddContactTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
 
diff --git a/tests/tracker/add-persona.vala b/tests/tracker/add-persona.vala
index 109c3c69..13a4ff95 100644
--- a/tests/tracker/add-persona.vala
+++ b/tests/tracker/add-persona.vala
@@ -133,7 +133,7 @@ public class AddPersonaTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/additional-names-updates.vala b/tests/tracker/additional-names-updates.vala
index de3ad710..7c7a620c 100644
--- a/tests/tracker/additional-names-updates.vala
+++ b/tests/tracker/additional-names-updates.vala
@@ -78,7 +78,7 @@ public class AdditionalNamesUpdatesTests : TrackerTest.TestCase
   private async void _test_additional_names_updates_async (BackendStore store)
     {
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/avatar-details-interface.vala b/tests/tracker/avatar-details-interface.vala
index 782d3389..26a0f58e 100644
--- a/tests/tracker/avatar-details-interface.vala
+++ b/tests/tracker/avatar-details-interface.vala
@@ -66,7 +66,7 @@ public class AvatarDetailsInterfaceTests : TrackerTest.TestCase
       yield store.prepare ();
 
       /* Set up the aggregator */
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/avatar-updates.vala b/tests/tracker/avatar-updates.vala
index 0c8ad7ba..cead31eb 100644
--- a/tests/tracker/avatar-updates.vala
+++ b/tests/tracker/avatar-updates.vala
@@ -81,7 +81,7 @@ public class AvatarUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/birthday-details-interface.vala b/tests/tracker/birthday-details-interface.vala
index c349b8e0..cfcdfb4e 100644
--- a/tests/tracker/birthday-details-interface.vala
+++ b/tests/tracker/birthday-details-interface.vala
@@ -70,7 +70,7 @@ public class BirthdayDetailsInterfaceTests : TrackerTest.TestCase
       var store = BackendStore.dup ();
       yield store.prepare ();
 
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/birthday-updates.vala b/tests/tracker/birthday-updates.vala
index f35fef51..9aae3e2d 100644
--- a/tests/tracker/birthday-updates.vala
+++ b/tests/tracker/birthday-updates.vala
@@ -88,7 +88,7 @@ public class BirthdayUpdatesTests : TrackerTest.TestCase
       var store = BackendStore.dup ();
       yield store.prepare ();
       /* Set up the aggregator */
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/default-contact.vala b/tests/tracker/default-contact.vala
index 14f01b07..b690c25e 100644
--- a/tests/tracker/default-contact.vala
+++ b/tests/tracker/default-contact.vala
@@ -66,7 +66,7 @@ public class DefaultContactTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/duplicated-emails.vala b/tests/tracker/duplicated-emails.vala
index 582907b5..4e67d36a 100644
--- a/tests/tracker/duplicated-emails.vala
+++ b/tests/tracker/duplicated-emails.vala
@@ -58,7 +58,7 @@ public class DuplicatedEmailsTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/duplicated-phones.vala b/tests/tracker/duplicated-phones.vala
index 1d5fae4e..b7a049bf 100644
--- a/tests/tracker/duplicated-phones.vala
+++ b/tests/tracker/duplicated-phones.vala
@@ -58,7 +58,7 @@ public class DuplicatedPhonesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/email-details-interface.vala b/tests/tracker/email-details-interface.vala
index e6a6fca1..3102770b 100644
--- a/tests/tracker/email-details-interface.vala
+++ b/tests/tracker/email-details-interface.vala
@@ -68,7 +68,7 @@ public class EmailDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/emails-updates.vala b/tests/tracker/emails-updates.vala
index 2c9c5dd4..f183b29e 100644
--- a/tests/tracker/emails-updates.vala
+++ b/tests/tracker/emails-updates.vala
@@ -93,7 +93,7 @@ public class EmailsUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/family-name-updates.vala b/tests/tracker/family-name-updates.vala
index da2af7b0..9ef13e72 100644
--- a/tests/tracker/family-name-updates.vala
+++ b/tests/tracker/family-name-updates.vala
@@ -77,7 +77,7 @@ public class FamilyNameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/favourite-details-interface.vala b/tests/tracker/favourite-details-interface.vala
index 61d72581..369e316d 100644
--- a/tests/tracker/favourite-details-interface.vala
+++ b/tests/tracker/favourite-details-interface.vala
@@ -82,7 +82,7 @@ public class FavouriteDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/favourite-updates.vala b/tests/tracker/favourite-updates.vala
index 0b24b497..656295ee 100644
--- a/tests/tracker/favourite-updates.vala
+++ b/tests/tracker/favourite-updates.vala
@@ -85,7 +85,7 @@ public class FavouriteUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/fullname-updates.vala b/tests/tracker/fullname-updates.vala
index aec16d70..ccd63be0 100644
--- a/tests/tracker/fullname-updates.vala
+++ b/tests/tracker/fullname-updates.vala
@@ -75,7 +75,7 @@ public class FullnameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/gender-details-interface.vala b/tests/tracker/gender-details-interface.vala
index 17cbf51a..270960e3 100644
--- a/tests/tracker/gender-details-interface.vala
+++ b/tests/tracker/gender-details-interface.vala
@@ -66,7 +66,7 @@ public class GenderDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/given-name-updates.vala b/tests/tracker/given-name-updates.vala
index 968759a5..962b26b1 100644
--- a/tests/tracker/given-name-updates.vala
+++ b/tests/tracker/given-name-updates.vala
@@ -76,7 +76,7 @@ public class GivenNameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/im-details-interface.vala b/tests/tracker/im-details-interface.vala
index dc80f11b..a835e193 100644
--- a/tests/tracker/im-details-interface.vala
+++ b/tests/tracker/im-details-interface.vala
@@ -70,7 +70,7 @@ public class ImDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/imaddresses-updates.vala b/tests/tracker/imaddresses-updates.vala
index 8e486dbf..c89425c9 100644
--- a/tests/tracker/imaddresses-updates.vala
+++ b/tests/tracker/imaddresses-updates.vala
@@ -79,7 +79,7 @@ public class IMAddressesUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/individual-retrieval.vala b/tests/tracker/individual-retrieval.vala
index 46a73464..dc28a51a 100644
--- a/tests/tracker/individual-retrieval.vala
+++ b/tests/tracker/individual-retrieval.vala
@@ -61,7 +61,7 @@ public class IndividualRetrievalTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/link-personas-via-local-ids.vala b/tests/tracker/link-personas-via-local-ids.vala
index 860cd790..b9bb9e23 100644
--- a/tests/tracker/link-personas-via-local-ids.vala
+++ b/tests/tracker/link-personas-via-local-ids.vala
@@ -95,7 +95,7 @@ public class LinkPersonasViaLocalIDsTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/link-personas.vala b/tests/tracker/link-personas.vala
index ba2b3003..ccc0a43c 100644
--- a/tests/tracker/link-personas.vala
+++ b/tests/tracker/link-personas.vala
@@ -97,7 +97,7 @@ public class LinkPersonasTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/match-all.vala b/tests/tracker/match-all.vala
index c1c09663..f1ec8f03 100644
--- a/tests/tracker/match-all.vala
+++ b/tests/tracker/match-all.vala
@@ -82,7 +82,7 @@ public class MatchAllTests : TrackerTest.TestCase
 
       if (this._aggregator == null)
         {
-          this._aggregator = new IndividualAggregator ();
+          this._aggregator = IndividualAggregator.dup ();
           this._aggregator.individuals_changed_detailed.connect
             (this._individuals_changed_cb);
         }
diff --git a/tests/tracker/match-email-addresses.vala b/tests/tracker/match-email-addresses.vala
index bcbc79f2..c9499c2c 100644
--- a/tests/tracker/match-email-addresses.vala
+++ b/tests/tracker/match-email-addresses.vala
@@ -59,7 +59,7 @@ public class MatchEmailAddressesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/match-im-addresses.vala b/tests/tracker/match-im-addresses.vala
index d914637c..c7fad9b6 100644
--- a/tests/tracker/match-im-addresses.vala
+++ b/tests/tracker/match-im-addresses.vala
@@ -59,7 +59,7 @@ public class MatchIMAddressesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/match-known-emails.vala b/tests/tracker/match-known-emails.vala
index caeea0ef..94f33c17 100644
--- a/tests/tracker/match-known-emails.vala
+++ b/tests/tracker/match-known-emails.vala
@@ -67,7 +67,7 @@ public class MatchKnownEmailsTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/match-name.vala b/tests/tracker/match-name.vala
index f2478033..88ee7f65 100644
--- a/tests/tracker/match-name.vala
+++ b/tests/tracker/match-name.vala
@@ -117,7 +117,7 @@ public class MatchNameTests : TrackerTest.TestCase
 
       if (this._aggregator == null)
         {
-          this._aggregator = new IndividualAggregator ();
+          this._aggregator = IndividualAggregator.dup ();
           this._aggregator.individuals_changed_detailed.connect
             (this._individuals_changed_cb);
         }
diff --git a/tests/tracker/match-phone-number.vala b/tests/tracker/match-phone-number.vala
index 24246d47..9ad36d36 100644
--- a/tests/tracker/match-phone-number.vala
+++ b/tests/tracker/match-phone-number.vala
@@ -61,7 +61,7 @@ public class MatchPhoneNumberTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/name-details-interface.vala b/tests/tracker/name-details-interface.vala
index 97f60ba6..429fb0eb 100644
--- a/tests/tracker/name-details-interface.vala
+++ b/tests/tracker/name-details-interface.vala
@@ -69,7 +69,7 @@ public class NameDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/nickname-updates.vala b/tests/tracker/nickname-updates.vala
index bdfda34c..64b30769 100644
--- a/tests/tracker/nickname-updates.vala
+++ b/tests/tracker/nickname-updates.vala
@@ -70,7 +70,7 @@ public class NicknameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/note-details-interface.vala b/tests/tracker/note-details-interface.vala
index 3ed76df8..8e484d27 100644
--- a/tests/tracker/note-details-interface.vala
+++ b/tests/tracker/note-details-interface.vala
@@ -67,7 +67,7 @@ public class NoteDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/phone-details-interface.vala b/tests/tracker/phone-details-interface.vala
index 7c97b7b8..3340217b 100644
--- a/tests/tracker/phone-details-interface.vala
+++ b/tests/tracker/phone-details-interface.vala
@@ -67,7 +67,7 @@ public class PhoneDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/phones-updates.vala b/tests/tracker/phones-updates.vala
index 3ddea90a..65ce26eb 100644
--- a/tests/tracker/phones-updates.vala
+++ b/tests/tracker/phones-updates.vala
@@ -79,7 +79,7 @@ public class PhonesUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/postal-address-details-interface.vala b/tests/tracker/postal-address-details-interface.vala
index b450c9fe..c14d6bbe 100644
--- a/tests/tracker/postal-address-details-interface.vala
+++ b/tests/tracker/postal-address-details-interface.vala
@@ -98,7 +98,7 @@ public class PostalAddressDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/prefix-name-updates.vala b/tests/tracker/prefix-name-updates.vala
index e74589f5..a20c6aed 100644
--- a/tests/tracker/prefix-name-updates.vala
+++ b/tests/tracker/prefix-name-updates.vala
@@ -76,7 +76,7 @@ public class PrefixNameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/remove-contact.vala b/tests/tracker/remove-contact.vala
index 5571c562..7e8a9e34 100644
--- a/tests/tracker/remove-contact.vala
+++ b/tests/tracker/remove-contact.vala
@@ -65,7 +65,7 @@ public class RemoveContactTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/remove-persona.vala b/tests/tracker/remove-persona.vala
index 6367eb98..657a670a 100644
--- a/tests/tracker/remove-persona.vala
+++ b/tests/tracker/remove-persona.vala
@@ -63,7 +63,7 @@ public class RemovePersonaTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/role-details-interface.vala b/tests/tracker/role-details-interface.vala
index 65346bc9..064be8e5 100644
--- a/tests/tracker/role-details-interface.vala
+++ b/tests/tracker/role-details-interface.vala
@@ -67,7 +67,7 @@ public class RoleDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-avatar.vala b/tests/tracker/set-avatar.vala
index 794530b4..bad6f336 100644
--- a/tests/tracker/set-avatar.vala
+++ b/tests/tracker/set-avatar.vala
@@ -65,7 +65,7 @@ public class SetAvatarTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-birthday.vala b/tests/tracker/set-birthday.vala
index 56b8546e..8a5df059 100644
--- a/tests/tracker/set-birthday.vala
+++ b/tests/tracker/set-birthday.vala
@@ -69,7 +69,7 @@ public class SetBirthdayTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-duplicate-email.vala b/tests/tracker/set-duplicate-email.vala
index 0773a081..95452142 100644
--- a/tests/tracker/set-duplicate-email.vala
+++ b/tests/tracker/set-duplicate-email.vala
@@ -59,7 +59,7 @@ public class SetDuplicateEmailTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-emails.vala b/tests/tracker/set-emails.vala
index f2ebf0c4..b7e1dade 100644
--- a/tests/tracker/set-emails.vala
+++ b/tests/tracker/set-emails.vala
@@ -68,7 +68,7 @@ public class SetEmailsTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-favourite.vala b/tests/tracker/set-favourite.vala
index 90bc63e9..8eb2797c 100644
--- a/tests/tracker/set-favourite.vala
+++ b/tests/tracker/set-favourite.vala
@@ -82,7 +82,7 @@ public class SetFavouriteTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-full-name.vala b/tests/tracker/set-full-name.vala
index 7293b8ee..28a10d02 100644
--- a/tests/tracker/set-full-name.vala
+++ b/tests/tracker/set-full-name.vala
@@ -66,7 +66,7 @@ public class SetFullNameTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-gender.vala b/tests/tracker/set-gender.vala
index ab96b82c..7212177a 100644
--- a/tests/tracker/set-gender.vala
+++ b/tests/tracker/set-gender.vala
@@ -62,7 +62,7 @@ public class SetGenderTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-im-addresses.vala b/tests/tracker/set-im-addresses.vala
index a6e8f9f7..7b00e0ab 100644
--- a/tests/tracker/set-im-addresses.vala
+++ b/tests/tracker/set-im-addresses.vala
@@ -69,7 +69,7 @@ public class SetIMAddressesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-nickname.vala b/tests/tracker/set-nickname.vala
index e171a548..1f9e9627 100644
--- a/tests/tracker/set-nickname.vala
+++ b/tests/tracker/set-nickname.vala
@@ -69,7 +69,7 @@ public class SetNicknameTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-notes.vala b/tests/tracker/set-notes.vala
index c9b197aa..d5e3876a 100644
--- a/tests/tracker/set-notes.vala
+++ b/tests/tracker/set-notes.vala
@@ -65,7 +65,7 @@ public class SetNotesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-null-avatar.vala b/tests/tracker/set-null-avatar.vala
index 1b02c4bd..e6671fe0 100644
--- a/tests/tracker/set-null-avatar.vala
+++ b/tests/tracker/set-null-avatar.vala
@@ -61,7 +61,7 @@ public class SetNullAvatarTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-phones.vala b/tests/tracker/set-phones.vala
index 82b5afe7..49a5123e 100644
--- a/tests/tracker/set-phones.vala
+++ b/tests/tracker/set-phones.vala
@@ -68,7 +68,7 @@ public class SetPhonesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-postal-addresses.vala b/tests/tracker/set-postal-addresses.vala
index 9fa2be39..94471dd7 100644
--- a/tests/tracker/set-postal-addresses.vala
+++ b/tests/tracker/set-postal-addresses.vala
@@ -74,7 +74,7 @@ public class SetPostalAddressesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-roles.vala b/tests/tracker/set-roles.vala
index 4696c5aa..08501670 100644
--- a/tests/tracker/set-roles.vala
+++ b/tests/tracker/set-roles.vala
@@ -67,7 +67,7 @@ public class SetRolesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-structured-name.vala b/tests/tracker/set-structured-name.vala
index 1f449822..f39526f4 100644
--- a/tests/tracker/set-structured-name.vala
+++ b/tests/tracker/set-structured-name.vala
@@ -76,7 +76,7 @@ public class SetStructuredNameTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/set-urls.vala b/tests/tracker/set-urls.vala
index 80d7a11b..922087c9 100644
--- a/tests/tracker/set-urls.vala
+++ b/tests/tracker/set-urls.vala
@@ -66,7 +66,7 @@ public class SetURLsTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/suffix-name-updates.vala b/tests/tracker/suffix-name-updates.vala
index f1369146..ac4ff975 100644
--- a/tests/tracker/suffix-name-updates.vala
+++ b/tests/tracker/suffix-name-updates.vala
@@ -78,7 +78,7 @@ public class SuffixNameUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/url-details-interface.vala b/tests/tracker/url-details-interface.vala
index e3802bc2..3cba4424 100644
--- a/tests/tracker/url-details-interface.vala
+++ b/tests/tracker/url-details-interface.vala
@@ -72,7 +72,7 @@ public class UrlDetailsInterfaceTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try
diff --git a/tests/tracker/website-updates.vala b/tests/tracker/website-updates.vala
index 9095a5ce..b2942caa 100644
--- a/tests/tracker/website-updates.vala
+++ b/tests/tracker/website-updates.vala
@@ -78,7 +78,7 @@ public class WebsiteUpdatesTests : TrackerTest.TestCase
     {
       var store = BackendStore.dup ();
       yield store.prepare ();
-      this._aggregator = new IndividualAggregator ();
+      this._aggregator = IndividualAggregator.dup ();
       this._aggregator.individuals_changed_detailed.connect
           (this._individuals_changed_cb);
       try