try and wait better for all mapping updates to be processes in test