Fixing more test bench errors