Fixed stuff for test bench