Fix Messages widget and tests