Upgrade the testbench (6 min runtime)