Fixes to PopulateTableDataCollectorsHandlerTest