About to improve test bench