Improved test coverage and fixing a type issue with the announcements.