fix rps re-match + fix test