Adding message tests and corrected incorrect event