Add the rest of the topics to test