Added Event Comparator and Unit Tests