Small changes to testing, added TopicBlocker