Improve test program