Improved test player