XD-1455 - Tests now check exact count of messages