Fixing find_and_modify RS test to include a query