added testing
added fields to events