fixes for topics testing