Improved test compatibility