Bug fixing and editing the test bench