clean up + testbench change