Merge "A fix pairing test" into main