updated test cases, need to revisit event type changing, it's causing some issues