Merge "Fix synchronization issue in tests." into main