TestBed & TestSuite update
Patch for Test Suite and Test Bed