CONN-1195: Unit test fixes, Changes to Message Montor logic