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

fixing test that are failing after topic=null change