Added tests for event builder