Merge "Fix static state in PersisterAggregatorTest causing test failures depending...