Added support of new testbench