add more event samples and tests