cleaned up the testbench. Code smells