Improve test system