Currently the Settlement Aggregate Id only uses the Settlement date when being generated. This needs to also factor in the Estate Id. Add unit tests in for this generation to ensure the same date/estate id combination always generate the same Id.