Remove unnecessary event triggering used in testing