Improved test method