Lot of work on MergedRecordStore, still missing unit tests