Rework classes involved in testCreateReplicationWithExtraHeaders