fix: rps_match_id can be invalid
update tests