Improved test application