(PDB-660) Convert events to streaming, other test cases not working yet