fixing test that are failing after topic=null change