Improved the test app.