Improved TestApp