Improve test tools