Merge "Edit NEM tests to prevent flakiness"