Rsvp2 Fix merge failing tests