CS fix
Updated for the latest changes to testbench