Add event messages and tests