[TB] [79180332] another test & some bugfixes