Improve testing system