multi-message subscribe fix and unit tests