For ENG-6702, fix various issues with promotion and unique ids and modify tests to validate the ID propagates