Fix test syntax error
Fix basic_adapter/find_test failing tests
Merge pull request #2 from teddyzeenny/rsvp2

Rsvp2 Fix merge failing tests