improve testing tools