fixing test that are failing after topic=null change
Merge pull request #919 from clebertsuconic/Branch_2_2_AS7

fixing test that are failing after topic=null change