fix rps_matches expiration + improve expiration tests (also test if expiration occurs in the correct block)