Extend TestBenchTestCase functionality (#12945, #12946)

Change-Id: Idc3165e9dc7e827b43ebf0634ce5a3d7cd21db9c