Updated tests to handle new topics