Improved test?