1) Added better visibility into message counts. 2)Expanded unit tests.