Merge "Only save newly received events during testing"