finish removal of sfevent in client tests