Improve test application